Bug fixes for aiming reticle. Beginnings of work on click-to-shoot.
Merge commit '1d608a8f6a8c6525dbf04ab16b1d8b7d071ea8fa'

Conflicts:
	UnityPrototype/Assets/Scenes/Prototype.unity
Manual scene merge