Set new candies for the incoming candies
Merge branch 'cm-7' of https://github.com/karencatearabit/tcgroupapp into dev_1.0
Merge branch 'dev_1.0' into cm-5

Conflicts:
	CandyMadness/CandyMadness/Controller/CMGameViewController.m