Merge branch 'master' into feature-progress-model
added Progress model
Merge branch 'feature-progress-model'