Integra��o do UfoB
Merge branch 'master' of https://github.com/startupcursos/jogo-acao

Conflicts:
	cocos2d.js
	src/resource.js