Merge branch 'devlop' into feature/bird1204

Conflicts:
	miniGame/recipesWithICarouselViewController.m