fix js code so jshint pass. Fixes #163, Fixes #162
move angular-mocks to vendor
Merge branch 'master' into js_refactor

Conflicts:
	course_material/static/js/course_material/directives.js
	forum/static/js/forum/directives.js
Merge branch 'js_refactor'