Merge branch 'master' into develop
fixed ddp import statement in example view controller