Merge branch 'master' of https://bitbucket.org/divertap/productos.juegos.rita.cocos2d-jsapp

Conflicts:
	Rita/App/Source/interface/CreditosScene.ccbmmmm