Fixed media upload bug of article
Merge pull request #976 from linzongshu/develop

Fixed media upload bug of article
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
Code cleaning
Code refactoring
Code refactoring
Added support for online customization for themes
Added support for online customization for themes
Improved file scan in directories
Theme custom
Merge pull request #979 from sexnothing/develop

Theme custom
Fixes typo
Theme custom function
Merge pull request #981 from sexnothing/develop

Theme custom function
Typo fixes