Newcontrols, singularitylauncher, selecting weapon
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scripts/InventoryManager.cs
	Assets/Scripts/ShipScripts/PlayerShip.cs