fixed lives problem
Merge remote-tracking branch 'origin/master' into Duong
merged success
added fade feature
temp
fixed game over
Merge branch 'Duong' into release_0.2 and resolve conflicts

Conflicts:
	SWAG.gmx/SWAG.project.gmx
	SWAG.gmx/objects/obj_character.object.gmx
	SWAG.gmx/objects/obj_controller.object.gmx
	SWAG.gmx/objects/obj_menu_credits.object.gmx
	SWAG.gmx/objects/obj_menu_play.object.gmx
	SWAG.gmx/rooms/rm_game.room.gmx