Merge 'calendar into 'master' branch
Merge 'content' into 'master'. Add tests for ContentCtrl and CourseSerice
added missing comma
Merge branch 'master' of https://github.com/librecms/librecms into content
Merging bower.json
Creating new course material.
Merging
Merging