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
imports the production backup into staging db
fix forum answer and remove admin
Merge branch 'master' of github.com:hacklabr/timtec
start to implements directive to replace flat-ui, refs #115
new format for sql backup
no privilegies or owner when importing db to staging
resolve json serialization problems
fixes validation bug allowing @ in usernames
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
touch wsgi-reload file for reloading the uwsgi
touches wsgi-reload for staging as well
replace fake dropdown by <select>
Merge branch 'master' of github.com:hacklabr/timtec
remove forgotten code