fix for new page bug
Merge branch '1.2' of https://github.com/pagelines/DMS into 1.2

Conflicts:
	editor/editor.handler.php