Fix #3264. Thanks @websemantics
Merge branch 'refs/heads/2.3/develop' into 3.0/develop
protect against errors
Show page type title
Something is up here but this get's through the migration
Blank UI class for now
Not a submodule
Working on UI
Keep order and is_home columns on pages table
Also eager load entry for page tree
Update page tree template
Use the template collection for this model
Merge branch '2.3/develop' of github.com:pyrocms/pyrocms into 2.3/develop
Merge branch 'refs/heads/2.3/develop' into 3.0/develop

Conflicts:
	system/cms/modules/keywords/libraries/Keywords.php
	system/cms/modules/pages/controllers/admin.php
	system/cms/modules/pages/src/Pyro/Module/Pages/Model/Page.php
	system/cms/modules/pages/views/admin/ajax/page_details.php
	system/cms/modules/pages/views/admin/index.php
Merge branch 'refs/heads/3.0/develop' into AIWS/production