Merge 'content' into 'master'. Add tests for ContentCtrl and CourseSerice