debut d'integration de la mui dans scene
Merge branch 'master' of https://github.com/AS-2013-2014/Projet

Conflicts:
	src/game/Scene.cpp