Turrets show up

When you click on the slot the turret shows up
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Resources/ClassicSpace/Material/ClassicSpaceMaterial.mat
	DeepSpaceMineFinal.userprefs