this is obviously a big change
Merge branch 'master' of https://github.com/sukhada/15239

Conflicts:
	TheGame/GlobalVariables.js
	TheGame/cocos2d.js
	TheGame/res/Roboto.ttf