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