Improve enemy spawners
Add a new Follow state for friendly AI
Optimise autoaim
Merge remote-tracking branch 'refs/remotes/origin/Levels' into alex

Conflicts:
	Assets/Scenes/Level_LTD001.unity
Check in architectural changes as part of TeamHandler EnemiesInFrontOf
Merge remote-tracking branch 'refs/remotes/origin/master' into alex

Conflicts:
	Assets/TestProject/Scripts/Weapons/WeaponBase.cs
ubar auto-aim
Tweak to aiming - doesn't snap back up to horizontal when you switch weapons.
Merge branch 'refs/heads/Rami' into alex
tweaking textures
Merge branch 'refs/heads/alex'

Conflicts:
	Assets/TestProject/Scripts/AI/AIBase.cs
	Assets/TestProject/Scripts/Weapons/WeaponBase.cs
Added "Enemy" tag to roller
Merge branch 'master' of https://github.com/AlexHayton/UnityTestProject2
hot
Fix stuff
Merge branch 'Levels' of https://github.com/AlexHayton/UnityTestProject2 into Levels

Conflicts:
	Assets/Scenes/Level_LTD001.unity
	Assets/Scenes/Level_LTD001/LightmapFar-0.exr
	Assets/Scenes/Level_LTD001/LightmapFar-1.exr
	Assets/Scenes/Level_LTD001/LightmapFar-2.exr
	Assets/Scenes/Level_LTD001/LightmapFar-2.exr.meta
	Assets/Scenes/Level_LTD001/LightmapNear-0.exr
	Assets/Scenes/Level_LTD001/LightmapNear-1.exr
	Assets/Scenes/Level_LTD001/LightmapNear-2.exr
	Assets/Scenes/Level_LTD001/LightmapNear-2.exr.meta
	Assets/Scenes/Level_LTD001/NavMesh.asset
Merge branch 'refs/heads/Levels' into alex
Add new player model!
Added animations
Fixed the prefab position for new player model