Merge branch 'master' of https://bitbucket.org/3LifeStudios/jungle-bungle

Conflicts:
	Jungle_Bungle.project.gmx
	objects/obj_player.object.gmx
