Merge branch 'dev' of https://github.com/rickardz/SchemeApp into dev

Conflicts:
SchemeApp/SchemeApp.xcworkspace/xcshareddata/SchemeApp.xccheckout
solve conflict