Fix warnings, include, and previous merge.
DigCapacity. Digging diagonally must be fixed when the collisions are fixed.
Merge branch 'master' into dev-trf

Conflicts:
	include/LevelMapParser.hpp
	src/CollisionShape.cpp
	src/GameManager.cpp