Revert "Revert "Merge branch 'master' of https://github.com/mojowen/Snaptivist-iOS""

This reverts commit 1d2d9228b90bf5e2575a57b6a961f19391df2df1.
reverint pbxproj
Merge branch 'master_fix'