Added Game Over Popup
(pending code to reset the game)
Merge branch 'dev_1.0' of https://github.com/karencatearabit/tcgroupapp into cm-7
Merge branch 'dev_1.0' of https://github.com/karencatearabit/tcgroupapp into cm-7

Conflicts:
	CandyMadness/CandyMadness/Controller/CMGameViewController.h
	CandyMadness/CandyMadness/Controller/CMGameViewController.xib
Added new files