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

Conflicts:
	src/game/Entity.cpp
	src/game/Entity.hpp
	src/game/entities/Platform.cpp
	src/game/entities/Platform.hpp