resolve conflicts
Merge branch 'lester.com.firefly.dev' of https://github.com/Tri-NventSystemsInc/tri-accounting into lester.com.firefly.dev

Conflicts:
	src/main/webapp/WEB-INF/views/admin/coa/partials/chart-of-accounts.jsp
	src/main/webapp/WEB-INF/views/admin/user/partials/user-list.jsp
	tri-accounting.iml
Merge branch 'lester.com.firefly.dev' of https://github.com/Tri-NventSystemsInc/tri-accounting into lester.com.firefly.dev

Conflicts:
	tri-accounting.iml