# Conflicts:
#	application/api/controller/Broker.php
#	application/index/controller/Finance.php
#	application/index/controller/OperationData.php
#	application/index/controller/Remark.php
#	application/index/view/remark/remark_follow_index.html
#	application/route.php
#	public/app/js/detaila_tl.js
#	public/resource/template/commissionTotal_template_tpl.html