---after removing the resource frequency
Merge branch 'Refactoring' of https://github.com/open-learning-exchange/BeLL-Apps into Refactoring