Mac 2 changes
Merge branch 'master' of https://github.com/centurionas/test-project

Conflicts:
	TestProject/TestProject.xcodeproj/project.pbxproj