Merge branch 'master' of https://github.com/jekkos/pocketmoney

Conflicts:
	app/main.js
Merge branch 'master' of https://github.com/jekkos/pocketmoney

Conflicts:
	scripting/game.js
Merge branch 'master' of https://github.com/jekkos/pocketmoney

Conflicts:
	scripting/game.js