Carrier bug fixes
Merge branch 'master' of github.com:gerstrong/Commander-Genius

Conflicts:
	src/engine/vorticon/finale/CFinaleStaticScene.cpp