Merge pull request #1 from adaptlearning/develop

Develop
Merge branch 'master' into develop

* master: