Merge branch 'firefly.tri-accounting.dev' into lester.com.firefly.dev

Conflicts:
	src/main/webapp/WEB-INF/tags/header.tag
	src/main/webapp/WEB-INF/tags/nav.tag
Merge remote-tracking branch 'origin/lester.com.firefly.dev' into lester.com.firefly.dev
change users setup
change roles setup
Merge branch 'firefly.tri-accounting.dev' into lester.com.firefly.dev