# Conflicts:
#	application/api_broker/controller/Shop.php
#	application/api_broker/service/BrokerService.php
#	application/index/controller/CellPhone.php
#	application/index/controller/Login.php