Update Xcode project
Merge branch 'develop' of https://github.com/KabukiAdam/MagicalRecord into develop

Conflicts:
	Project Files/Tests/Support/Vendor/Expecta