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

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