update from server@eng.local
update from server@cht.local
Merge branch 'cht.local' into cht
aboutus使用lightbox
Merge branch 'eng.local' into cht.local

Conflicts:
	.htaccess
	templates/ws-index-tpl.html
Merge branch 'cht.local' into cht