gsgsg
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	MiniGamesCollection/MiniGamesCollection.xcodeproj/project.xcworkspace/xcuserdata/HeartAce.xcuserdatad/UserInterfaceState.xcuserstate