Merge branch 'master' into Rami
Merge branch 'master' into JimWest
Merge branch 'master' into Levels
Merge remote-tracking branch 'refs/remotes/origin/odkken2' into Levels
Made lasers a little more visible
Made the enemy health bars less annoying
Made bullets more visible
Made an energyItem class
Corrected spelling on HealthItem
Wired up energy pickups
Added AIBase script (nothing much in there yet)
added healing zone models and made a prefab for it( in preperation for droppable medpack by player )
Added some force to the bullets
Added pickups (weighted random) to the enemies
Merge branch 'master' of https://github.com/AlexHayton/UnityTestProject2 into Rami
Added some features to the ai base, AI is roaming around
Added script for energy pull
tidied up laser stuff
Merge branch 'master' of https://github.com/AlexHayton/UnityTestProject2
Weapon now rotates to match player when instantiated.
More laser tweaks, mo visible now.
Merge remote-tracking branch 'refs/remotes/origin/master' into alex

Conflicts:
	Assets/TestProject/Scenes/Ship.unity
	Assets/TestProject/Scripts/Pickupables/EnergyItem.cs
Added new Enemy to spawner (searching for enemies now, doesnt look better yet)