Add theme edit for system module
Update page-demo.phtml
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	usr/theme/default/template/layout-admin.phtml
Add theme edit function for system module
Merge branch 'develop' of https://github.com/sexnothing/pi into develop
Merge pull request #978 from sexnothing/develop

Develop