update from server@eng.local
update from server@jap.local
Merge branch 'jap.local' into jap
config of jap after online
產品內頁加上addthis及favorite按鈕
Merge branch 'eng.local' into jap.local

Conflicts:
	templates/ws-fn-footer-tpl.html
	templates/ws-fn-index-header-tpl.html
	templates/ws-index-tpl.html
移除首頁多餘的meta宣告
Merge branch 'jap.local' into jap
移除css不存在的背景圖宣告
Merge branch 'eng.local' into jap.local
Merge branch 'jap.local' into jap