Merge branch 'master' of https://github.com/fueg0/phase0

Conflicts:

TaskHuman/TaskHuman.xcodeproj/project.xcworkspace/xcshareddata/TaskHuman
.xccheckout
1