now with a weaponscene
Merge branch 'HelmTeam5' of github.com:gametechnology/psi-2013 into HelmTeam5

Conflicts:
	build/HelmTeam5/Stella Incognita.vcxproj