# Conflicts:
#	application/api_broker/controller/CellPhone.php
#	application/api_broker/controller/Shop.php
#	application/index/controller/Agent.php
#	application/index/controller/CellPhone.php
#	application/index/controller/Finance.php
#	application/index/controller/Member.php
#	application/index/view/member/users_list.html
#	application/model/BindingPhone.php
#	application/model/GHouses.php
#	application/model/OBargainModel.php
#	application/route.php
#	application/task/controller/PrivacyNumber.php
#	public/resource/js/user.js