new collision map and collision debug

Added a collision map for object and made a debug mode for collision.
Set debugCollision to true/false.
Merge branch 'master' of https://github.com/ttsuchiya/PrjStudio_GrpA

Conflicts:
	concept_s/concept_s.pde