changes
Merge branch 'develop' of https://github.com/jscorales/kapflix-author into develop