Merge branch 'master' of https://github.com/albertinad/guess-it-game-xdk

Conflicts:
	guess-it-game-xdk.xdk
	www/index.html
	www/js/index_user_scripts.js
Merging unresolved conficts