Changement de character en player
Retrait du rectangle shape de Platform
Modifications
Merge branch 'master' of https://github.com/AS-2013-2014/Projet

Conflicts:
	src/game/Entity.cpp
	src/game/Game.cpp
	src/game/Scene.cpp
	src/game/entities/Platform.cpp
	src/game/entities/Player.cpp
	src/game/entities/Player.hpp

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

This reverts commit eb3e06ea59b3b1574195eb6bf54fba85b934196a, reversing
changes made to 63b5a6fb1d46f4749ace340b0a072d826fb06fdd.

unmerging