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
user json field in answer serialize, ajust template and loads last answer for an activity in lesson view, refs #115
uses django braces to LoginRequiredMixin
start to implements directive to replace flat-ui, refs #115
new format for sql backup
Merge branch 'master' into staging

Conflicts:
	Makefile
requires professors group to access admin view
Merge branch 'master' into staging
user json field in answer serialize, ajust template and loads last answer for an activity in lesson view, refs #115
start to implements directive to replace flat-ui, refs #115
decouple admin
fix conflict
fix profile url reverse so user with @ in username
Merge branch 'master' into issue115

Conflicts:
	lesson/serializers.py
	lesson/static/templates/activity_trueorfalse.html
only restores the public schema on staging
copies static user files from production to staging
Merge branch 'master' into staging
touch wsgi-reload file for reloading the uwsgi