save and cancel buttons for videos in course admin page
ignore autogenerated files
fixing layout
simplify karma usage
run karma tests on travis too
merge conflict
Merge branch 'activity-admin'
better yet karma config
reindent
Merge branch 'master' into course_material