Merge commit 'c83019f7140091c66d6095c9610d4e5144611dca'

Conflicts:
	Assets/Scenes/JKLR.unity
Merge remote-tracking branch 'Projetos/master'

Conflicts:
	Assets/Scenes/JKLR.unity