No compilation bugs for convex-convex collision
Displays convex hull when running on debug mode
Merge branch 'master' into Collision

Conflicts:
	src/CandyMath.cpp
	src/CandyShip.cpp
remove merge junk
remove a warning
Merge branch 'master' of http://github.com/fbessou/Projet2MIC