Merge branch 'dev' into Ark

Conflicts:
iCoffee/iCoffee.xcodeproj/project.pbxproj