Merge branch 'master' into JimWest
Merge branch 'refs/heads/master' into JimWest
Re-added scrolling texture
Subtle improvements to bullets for multiple collider support
GUI Stuff
tweaked energy and health pills
Merge branch 'Rami' of https://github.com/AlexHayton/UnityTestProject2 into Rami
Fixed GUIHandler.
Added the pickups to EnemyNew.prefab.
Merge remote-tracking branch 'remotes/origin/Rami' into alex

Conflicts:
	Assets/TestProject/Scenes/Ship.unity
Merge remote-tracking branch 'remotes/origin/JimWest' into alex