update from server@eng.local
產品彈出dialog顯示產品敘述
update nivo from server@eng.local
update from server@spa.local
Merge branch 'spa.local' into spa
Merge branch 'eng.local' into spa.local

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