use question from angular to display question related data
html - minor changes
integrating new admin with restframework
fix broken filter
adds APPEND_SLASH to settings and fix urls to use /
coment unused js code after return true (so jshint wont complain)
Merge branch 'master' of github.com:hacklabr/timtec
layout for markdown errors in new admin
Fixes #255 changes the lesson url from /lesson/slug to /course/slug/lesson/slug
Merge branch 'master' of github.com:hacklabr/timtec

Conflicts:
	core/templates/course.html
Merge branch 'master' of github.com:hacklabr/timtec

Conflicts:
	administration/static/js/courses/controllers.js
add label-default for unknown status
minor html and css fixes
layout admin - organizing lessons
remove warning directive
visual bell to know when save fails
fix content editable in new course page
add placeholder attr to contenteditable elements
remove console.log
Resolving conflicts