Money Life - Bug Fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	money-life/js/main-game.js