# Conflicts:
#	application/index/controller/Finance.php
#	public/app/dist/index.html
#	public/app/dist/static/css/app.114859684c94a19f75437a9f4ca158c8.css
#	public/app/dist/static/css/app.fb0495c45d8e8f4a215b24c757e3a74d.css
#	public/app/dist/static/css/app.fb80942a8f4629b9d9ca5ae8252cd001.css
#	public/app/dist/static/js/app.2cb278bd36009512e8d4.js
#	public/resource/js/getCollection.js