update
Merge branch 'master' of https://github.com/veue/mddemo

Conflicts:

MDDemo.xcodeproj/project.xcworkspace/xcuserdata/weetom.xcuserdatad/UserI
nterfaceState.xcuserstate