marteLandscape_Fabiano
Merge branch 'master' into marteLandscape

Conflicts:
	cocos2d.js
	src/resource.js
	src/scenes/MainmenuScene.js
Merge pull request #69 from startupcursos/marteLandscape

marteLandscape_Fabiano