Merge remote-tracking branch 'origin/master'

Conflicts:
	src/gamejam/Game.as
	src/gamejam/object/GameObject.as
	src/gamejam/object/entity/EntityPlayer.as
	src/gamejam/object/platform/Platform.as