update from server@local.eng
Merge branch 'local.eng' into master.eng
modification on gallery from shoeswonderland

Conflicts:
	conf/config.inc.php
remove including creditcart.php
activate ws_stores
new image for stores
套門市管理
Merge branch 'local.eng' into master.eng