Merge branch 'development' of https://github.com/Coursemology/coursemology.org into marketplace
Merge branch 'marketplace' of https://github.com/DIdiHL/coursemology.org into marketplace