update from server@eng.local
update from server@spa.local
Merge branch 'spa.local' into spa
修改del為delete
調整dialog title-bar的樣式
Merge branch 'eng.local' into spa.local

Conflicts:
	css/cms-index.cssBAK2
	css/index.cssBAK2
Merge branch 'spa.local' into spa