mediumEditor
Merge branch 'master' of https://github.com/e-mln-e/edition

Conflicts:
	tpl/section-text.tpl.php