# Conflicts:
#	application/index/controller/Member.php
#	public/resource/template/user_template_tpl.html

(cherry picked from commit 826e71ae)

# Conflicts:
#	application/api_broker/service/UploadFileService.php
#	application/index/controller/Collection.php
#	application/index/controller/Finance.php
#	application/index/view/agent/agent.html
#	application/index/view/collection/getCollection.html
#	public/app/dist/index.html
#	public/app/dist/static/css/app.2c71066ef70dbce04427e0ec71aee085.css
#	public/app/dist/static/css/app.2c71066ef70dbce04427e0ec71aee085.css.map
#	public/app/dist/static/css/app.65a7482b65465b468cd50d083c6b13f2.css
#	public/app/dist/static/css/app.cf2603707f2f5640ca6c8f596dac90c4.css
#	public/app/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
#	public/app/js/customerinfo_details_new.js
#	public/resource/js/agent.js
#	public/resource/js/getCollection.js
#	public/resource/template/get_collection_template_tpl.html