图标统计
Merge branch 'master' of https://github.com/Foboy/FinancialSystem

Conflicts:
	admin/css/financial.css
	admin/scripts/financial_app.js
	admin/scripts/rest-urls.js