Minor changes
Merge branch 'master' of https://github.com/cullensu/Capstone

Conflicts:
	game_src/src/project/manager/AIShipManager.as
	game_src/src/project/ship/behavior/ShipBehaviorFactory.as