catalog edit and backstage start

catalog edit and backstage start
Merge remote-tracking branch 'origin/master'

Conflicts:
	themes/Changhua/layout/default/left/left.html