Xcode changes
Merge branch 'develop' of github.com:nothirst/tapkulibrary into develop

Conflicts:
	src/TapkuLibrary.xcodeproj/project.pbxproj