fixing imports after code refactor
Merge branch 'develop' of https://github.com/learningequality/ka-lite into develop