Apply Inspinia to HOME page - Partial (On-Going)
Apply Inspinia to HOME page - Partial 2 (On-Going)
Merge branch 'firefly.tri-accounting.dev' into lester.com.firefly.dev

Conflicts:
	src/main/webapp/WEB-INF/tags/nav.tag
Apply Inspinia to HOME page - Partial 3 (On-Going)
iml
Merge branch 'firefly.tri-accounting.dev' into lester.com.firefly.dev
Apply Inspinia to HOME page - Partial 3 (On-Going)
Merge branch 'firefly.tri-accounting.dev' into lester.com.firefly.dev
Merge remote-tracking branch 'origin/lester.com.firefly.dev' into lester.com.firefly.dev

Conflicts:
	src/main/webapp/WEB-INF/tags/master.tag
Apply Inspinia to HOME page - Partial 3 (Menu JS are Working)
Apply Inspinia to HOME page - DONE
js error adjustment
Merge branch 'firefly.tri-accounting.dev' into lester.com.firefly.dev
inspinia application
setup changes
properties
Dashboard in Firefly
Fix Routes of Inspinia - Partial
Merge branch 'firefly.tri-accounting.dev' into lester.com.firefly.dev
Merge remote-tracking branch 'origin/lester.com.firefly.dev' into lester.com.firefly.dev

Conflicts:
	src/main/resources/application-production.properties
	src/main/resources/application-staging.properties
Dashboard in Firefly