More project settings changes for iOS. Now it should actually build.
Merge branch 'master' into tincan

Conflicts:
	iOS/maslo-player/maslo-player.xcodeproj/project.pbxproj