update from server@spa.local
Merge branch 'spa.local' into spa
調整左邊ebook連結根目錄
Merge branch 'eng.local' into spa.local

Conflicts:
	templates/ws-fn-all-tpl.html
Merge branch 'spa.local' into spa