Fase 8
Merge branch 'master' into 18-fase8

Conflicts:
	cocos2d.js
Merge pull request #44 from startupcursos/18-fase8

Fase 8