Lua
AlinhandoMarteMusica-Fabiano
Merge branch 'master' into AlinhandoMarteMusica-Fabiano

Conflicts:
	src/layers/GameLayer.js
Merge pull request #80 from startupcursos/AlinhandoMarteMusica-Fabiano

AlinhandoMarteMusica-Fabiano
Merge branch 'master' into Lua

Conflicts:
	src/scenes/MainmenuScene.js
PQP
Merge pull request #81 from startupcursos/Lua

Lua
Terra
Ajustes de gameplay
Level Design Jupiter
Merge branch 'master' into venus-cont

Conflicts:
	src/layers/VenusCeuLayer.js

src/layers/VenusMontanhaLongeLayer.js
	src/layers/VenusMontanhaPertoLayer.js
	src/scenes/Cut5VenusScene.js
	src/scenes/Level8VenusScene.js
Merge branch 'venus-cont' of https://github.com/startupcursos/jogo-acao into venus-cont

Conflicts:
	src/layers/LuaCeuLayer.js
	src/layers/LuaMontanhaLongeLayer.js
	src/layers/LuaMontanhaPertoLayer.js
	src/resource.js
	src/scenes/Cut8VenusScene.js