Merge pull request #30 from adaptlearning/feature/28

Feature/28
Merge branch 'develop' of https://github.com/adaptlearning/adapt_framework into feature/#32

* 'develop' of https://github.com/adaptlearning/adapt_framework: