new
new
a
apply inspinia to login page
tets
Merge branch 'firefly.tri-accounting.dev' into lester.com.firefly.dev
test commit
inspinia css, js, bootstrap, login page
Merge remote-tracking branch 'origin/lester.com.firefly.dev' into lester.com.firefly.dev

Conflicts:
	src/main/webapp/resources/js/directives.js
inspinia theme apply to login page
Merge branch 'lester.com.firefly.dev' into lester.com.firefly.dev-2

Conflicts:
	src/main/webapp/WEB-INF/tags/footer.tag
	src/main/webapp/WEB-INF/tags/header.tag
	src/main/webapp/resources/js/app/controllers/account-ctrl.js
	src/main/webapp/resources/js/app/directives/tree-grid-directive.js
	src/main/webapp/resources/js/app/routes/account-route.js
	src/main/webapp/resources/js/app/services/error-handler-service.js
	tri-accounting.iml
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
jdk change
Script in login page
Merge branch 'lester.com.firefly.dev-2' into lester.com.firefly.dev

Conflicts:
	tri-accounting.iml
Script
clear folders for css
css, js update
Merge branch 'lester.com.firefly.dev-2' into lester.com.firefly.dev