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
replace fake dropdown by <select>

(cherry picked from commit 530abe277eef5cb8f7f1a1352bde16ca8b27747a)

remove forgotten code

(cherry picked from commit b95d637c4fcb0e1898fc6622262f7fbe92457e67)
layout for the admin
layout admin
user json field in answer serialize, ajust template and loads last answer for an activity in lesson view, refs #115
decouple admin
fix conflict
Merge branch 'admin' of github.com:hacklabr/timtec into admin

Conflicts:
	lesson/serializers.py
	lesson/static/js/lesson.js
	lesson/static/templates/activity_multiplechoice.html
	lesson/static/templates/activity_simplechoice.html
	lesson/static/templates/activity_trueorfalse.html
	lesson/templates/lesson.html
adding pagination to the list of courses
remove conflict marks
adding _base.html again
Merge branch 'admin' of github.com:hacklabr/timtec into admin
starting layout for the users lists
changing the template
layout admin
layout
Merge branch 'master' into admin

Conflicts:
	admin/templates/_base.html
	administration/templates/_base.html
	administration/templates/admin-base.html
	core/templates/admin/_base.html
	core/templates/header-authenticated.html
	timtec/settings.py
	timtec/urls.py