planta ok
Merge branch 'master' into 7-Criar-inimigo-do-tipo-planta

Conflicts:
	cocos2d.js
	res/HD/spritesheet.plist
	res/HD/spritesheet.png
	res/Normal/spritesheet.plist
	res/Normal/spritesheet.png
	res/spritesheet.plist
	res/spritesheet.png
	src/layers/GameLayer.js
	src/resource.js
Merge pull request #33 from startupcursos/7-Criar-inimigo-do-tipo-planta

planta ok