delete more c++11 changes
fix trap

delete list of platforms and traps
tralala
Merge branch 'master' of https://github.com/vlastachu/n1bounce

Conflicts:
	src/Engine.cpp
	src/FixedMapShape.h
	src/Map.cpp
	src/Map.h
	src/Platform.h