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

Conflicts:
	Snaptivist.xcodeproj/project.pbxproj
Merging storyboard