Fix navmap and ascenseur
Merge branch 'master' of github.com:Khoyo/GGJ_2014

Conflicts:
	Assets/Scenes/Level1.unity