push to pull
Merge branch 'master' of https://github.com/svenne87/betbattle

Conflicts:
	Resources/iphone/alloy/controllers/settings.js