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
Lazer betr.  For some reason "red" doesn't work - Maybe you can take a look at it Alex?

Added weapon swapping and shotgun.  Need to look into why instantiation is slow.
tweaked energy and health pills
Merge branch 'Rami' of https://github.com/AlexHayton/UnityTestProject2 into Rami
Fixed GUIHandler.
Added the pickups to EnemyNew.prefab.
small tweaks to bullets etc
Merge remote-tracking branch 'remotes/origin/Rami' into alex

Conflicts:
	Assets/TestProject/Scenes/Ship.unity
Merge remote-tracking branch 'remotes/origin/JimWest' into alex
Merge branch 'master' of https://github.com/AlexHayton/UnityTestProject2 into Rami

Conflicts:
	Assets/TestProject/Scenes/Ship.unity
Tweak pickup rates.
Removed a phantom shotgun from the scene.
Fixed laser colors (extra shotgun was hanging around in the player)
Bullets are no longer wasted on dead enemies (this means the shotgun is actually good close-up).  Tweaked shotgun values some.
Merge branch 'refs/heads/master' into alex
Added GUIWeaponSlot, Accessors to WeaponHandler and an icon to WeaponBase
Added a new scene for me to mess around in.
Improved the laser and how it deals with falling into empty space