commit
Merge branch 'master' of https://github.com/AS-2013-2014/Projet

Conflicts:
	src/game/Entity.cpp
	src/game/Entity.hpp
	src/game/Game.cpp
	src/game/Scene.cpp
	src/game/Scene.hpp
	src/game/Solid.cpp
	src/game/const.hpp
	src/game/entities/LivingEntity.cpp
	src/game/entities/Player.cpp