Salle de repos
Merge branch 'master' of https://github.com/noctisyounis/Gameweek-2014

Conflicts:
	Assets/Scripts/Javascript/Scenes/Loader.js