Merge remote-tracking branch 'origin/master' into 3rdPersonDeathCam

# Conflicts:
#	include/Engine/Core/EPlayerHealthPickup.h

resources/Schema/Entities/CapturePoint.xml

@@ -5,7 +5,7 @@
     <c:AABB/>
     <c:CapturePoint/>
     <c:Model>
-      <Resource>C:\Users\123456\Workspace\TacticalZ\assets\Models\Core\UnitSphere.mesh</Resource>
+      <Resource>Models/Core/UnitSphere.mesh</Resource>
     </c:Model>
     <c:Team/>
     <c:Transform/>

resources/Schema/Entities/Player.xml

@@ -6,6 +6,9 @@
       <Origin X="0" Y="0.772000015" Z="0"/>
       <Size X="1" Y="1.60000002" Z="1"/>
     </c:AABB>
+    <c:DashAbility>
+      <CoolDownMaxTimer>2.0</CoolDownMaxTimer>
+    </c:DashAbility>
     <c:Collidable/>
     <c:Health/>
     <c:Physics>
@@ -101,13 +104,6 @@
             </Entity>
             <Entity name="Weapon">
               <Components>
-                <c:ExplosionEffect>
-                  <ColorByDistance>true</ColorByDistance>
-                  <Velocity X="0.800000012" Y="0.0379999988" Z="0"/>
-                  <ExplosionDuration>3.7999999523162842</ExplosionDuration>
-                  <EndColor A="0" B="23.5294113" G="11.7647057" R="0"/>
-                  <Randomness>true</Randomness>
-                </c:ExplosionEffect>
                 <c:Model>
                   <Resource>Models/AssaultWeaponRed.mesh</Resource>
                 </c:Model>