update column width
Merge branch 'lester.com.firefly.dev' into firefly.tri-accounting.dev
fix missing js
fix report logo
Merge branch 'firefly.tri-accounting.dev' into lester.com.firefly.dev

Conflicts:
	src/main/webapp/WEB-INF/tags/nav.tag