now with weapon station class
Merge branch 'HelmTeam5' of github.com:gametechnology/psi-2013 into HelmTeam5
Merge remote-tracking branch 'origin/HelmTeam5' into HelmTeam5

Conflicts:
	build/HelmTeam5/Stella Incognita.vcxproj
	source/Game/main.cpp