we still need this strange workaround to have enter key working
Merge branch 'master' of https://github.com/lmsgit/lms
Merge branch 'master' into nicraM

Conflicts:
	templates/default/header.html
Merge branch 'nicraM' into Adescom