update dependencies and added gettext
merge
Beginning of a javascript translation framework
turning off language detection and fixing a bug on angular language settings
don't change language based on browser language
translations
fix lesson's notes layout
fix video thumbs layout (home)
fix header layout
organize courses in home templates in rows
Merge branch 'layout'

Conflicts:
	static/css/course.less
update django rest framework
update translations
added markdown flatpages support
don't debug missing translations
Merge remote-tracking branch 'origin/master' into js-gettext

Conflicts:
	administration/static/templates/directive.modalmarkdowneditor.html
Merge branch 'layout'
fix test
Merge branch 'layout'

Conflicts:
	bower.json
fix deploy