Merge remote-tracking branch 'origin/master'

Conflicts:
	bin-debug/Startup.swf
	src/game/Game.as
	src/game/Main.as
	src/game/Startup.as