# Conflicts:
#	application/api_broker/controller/SpreadUser.php
#	application/app/controller/Index.php
#	application/index/controller/ShareShop.php
#	application/index/view/broker/agent.html
#	application/index/view/performance_ranking/performance_ranking.html
#	application/model/USpreadUser.php
#	application/route.php
#	public/app/js/app_jump.js
#	public/resource/js/main.js
#	public/resource/js/performance_ranking.js