# Conflicts:
#	application/api_broker/controller/Performance.php
#	application/api_broker/controller/Shop.php
#	application/app/view/index/share_detail.html
#	application/model/GHouses.php
#	public/resource/js/user.js