Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Animations/itens/door.controller
	Assets/scenes/Lvl1.unity
	Assets/scripts/player.cs
Merge branch 'master' of https://github.com/stefaniprata/wotr