wip
Merge branch 'master' of https://github.com/robertgeifman/pop

Conflicts:
	pop.xcodeproj/project.pbxproj