massive refactor
Merge branch '1.1' of https://github.com/pagelines/DMS into 1.1

Conflicts:
	editor/editor.interface.php