-add default page tpl

-add default page tpl
-improve cherry pick
Merge branch 'development'

Conflicts:
	bundles/datatypes/views/partials/editor/rightside.html