Decreased the bounding box for intersection
Random placement of candies on the screen
Merge branch 'cm-4' into dev_1.0

Conflicts:
	CandyMadness/CandyMadness/CandyMadness-Prefix.pch
Merge branch 'dev_1.0' of https://github.com/karencatearabit/tcgroupapp into cm-7