apply inspinia t login page
apply inspina to login page
Improve front end file structures
return changes from test (changes made when studying inspinia and web tri)
Merge branch 'firefly.tri-accounting.dev' into lester.com.firefly.dev

Conflicts:
	src/main/java/com/tri/erp/spring/controller/HomeController.java
	src/main/webapp/WEB-INF/views/home.jsp
	src/main/webapp/WEB-INF/views/login.jsp
	src/main/webapp/resources/css/bootstrap.css
	src/main/webapp/resources/css/bootstrap/bootstrap.css
	src/main/webapp/resources/css/fa/font-awesome.min.css
	src/main/webapp/resources/css/fonts/FontAwesome.otf
	src/main/webapp/resources/css/fonts/fontawesome-webfont.eot
	src/main/webapp/resources/css/fonts/fontawesome-webfont.svg
	src/main/webapp/resources/css/fonts/fontawesome-webfont.ttf
	src/main/webapp/resources/css/fonts/fontawesome-webfont.woff
	src/main/webapp/resources/css/inspinia/animate.css
	src/main/webapp/resources/css/inspinia/bootstrap.css
	src/main/webapp/resources/css/inspinia/bootstrap.min.css
	src/main/webapp/resources/css/inspinia/patterns/congruent_pentagon.png
	src/main/webapp/resources/css/inspinia/patterns/header-profile-skin-1.png
	src/main/webapp/resources/css/inspinia/patterns/header-profile-skin-2.png
	src/main/webapp/resources/css/inspinia/patterns/header-profile-skin-3.png
	src/main/webapp/resources/css/inspinia/patterns/header-profile.png
	src/main/webapp/resources/css/inspinia/patterns/otis_redding.png
	src/main/webapp/resources/css/inspinia/patterns/shattered.png
	src/main/webapp/resources/css/inspinia/patterns/triangular.png
	src/main/webapp/resources/css/inspinia/style.css
	src/main/webapp/resources/css/inspinia/style.min.css
	src/main/webapp/resources/font-awesome/css/font-awesome.min.css
	src/main/webapp/resources/font-awesome/fonts/FontAwesome.otf
	src/main/webapp/resources/font-awesome/fonts/fontawesome-webfont.eot
	src/main/webapp/resources/font-awesome/fonts/fontawesome-webfont.svg
	src/main/webapp/resources/font-awesome/fonts/fontawesome-webfont.ttf
	src/main/webapp/resources/font-awesome/fonts/fontawesome-webfont.woff
	src/main/webapp/resources/fonts/inspinia/font-awesome/css/font-awesome.css
	src/main/webapp/resources/fonts/inspinia/font-awesome/css/font-awesome.min.css
	src/main/webapp/resources/fonts/inspinia/font-awesome/fonts/FontAwesome.otf
	src/main/webapp/resources/fonts/inspinia/font-awesome/fonts/fontawesome-webfont.eot
	src/main/webapp/resources/fonts/inspinia/font-awesome/fonts/fontawesome-webfont.svg
	src/main/webapp/resources/fonts/inspinia/font-awesome/fonts/fontawesome-webfont.ttf
	src/main/webapp/resources/fonts/inspinia/font-awesome/fonts/fontawesome-webfont.woff
	src/main/webapp/resources/fonts/inspinia/font-awesome/less/bordered-pulled.less
	src/main/webapp/resources/fonts/inspinia/font-awesome/less/core.less
	src/main/webapp/resources/fonts/inspinia/font-awesome/less/fixed-width.less
	src/main/webapp/resources/fonts/inspinia/font-awesome/less/font-awesome.less
	src/main/webapp/resources/fonts/inspinia/font-awesome/less/icons.less
	src/main/webapp/resources/fonts/inspinia/font-awesome/less/larger.less
	src/main/webapp/resources/fonts/inspinia/font-awesome/less/list.less
	src/main/webapp/resources/fonts/inspinia/font-awesome/less/mixins.less
	src/main/webapp/resources/fonts/inspinia/font-awesome/less/path.less
	src/main/webapp/resources/fonts/inspinia/font-awesome/less/rotated-flipped.less
	src/main/webapp/resources/fonts/inspinia/font-awesome/less/spinning.less
	src/main/webapp/resources/fonts/inspinia/font-awesome/less/stacked.less
	src/main/webapp/resources/fonts/inspinia/font-awesome/less/variables.less
	src/main/webapp/resources/fonts/inspinia/font-awesome/scss/_bordered-pulled.scss
	src/main/webapp/resources/fonts/inspinia/font-awesome/scss/_core.scss
	src/main/webapp/resources/fonts/inspinia/font-awesome/scss/_fixed-width.scss
	src/main/webapp/resources/fonts/inspinia/font-awesome/scss/_icons.scss
	src/main/webapp/resources/fonts/inspinia/font-awesome/scss/_larger.scss
	src/main/webapp/resources/fonts/inspinia/font-awesome/scss/_list.scss
	src/main/webapp/resources/fonts/inspinia/font-awesome/scss/_mixins.scss
	src/main/webapp/resources/fonts/inspinia/font-awesome/scss/_path.scss
	src/main/webapp/resources/fonts/inspinia/font-awesome/scss/_rotated-flipped.scss
	src/main/webapp/resources/fonts/inspinia/font-awesome/scss/_spinning.scss
	src/main/webapp/resources/fonts/inspinia/font-awesome/scss/_stacked.scss
	src/main/webapp/resources/fonts/inspinia/font-awesome/scss/_variables.scss
	src/main/webapp/resources/fonts/inspinia/font-awesome/scss/font-awesome.scss
	src/main/webapp/resources/images/main/firefly.png
	src/main/webapp/resources/images/main/firefly1.png
	src/main/webapp/resources/images/main/male.png
	src/main/webapp/resources/images/main/malemini.png
	src/main/webapp/resources/js/angular/inspinia/angular-animate.js
	src/main/webapp/resources/js/angular/inspinia/angular-animate.min.js
	src/main/webapp/resources/js/angular/inspinia/angular-animate.min.js.map
	src/main/webapp/resources/js/angular/inspinia/angular-cookies.js
	src/main/webapp/resources/js/angular/inspinia/angular-cookies.min.js
	src/main/webapp/resources/js/angular/inspinia/angular-cookies.min.js.map
	src/main/webapp/resources/js/angular/inspinia/angular-csp.css
	src/main/webapp/resources/js/angular/inspinia/angular-loader.js
	src/main/webapp/resources/js/angular/inspinia/angular-loader.min.js
	src/main/webapp/resources/js/angular/inspinia/angular-loader.min.js.map
	src/main/webapp/resources/js/angular/inspinia/angular-mocks.js
	src/main/webapp/resources/js/angular/inspinia/angular-resource.js
	src/main/webapp/resources/js/angular/inspinia/angular-route.js
	src/main/webapp/resources/js/angular/inspinia/angular-sanitize.js
	src/main/webapp/resources/js/angular/inspinia/angular-scenario.js
	src/main/webapp/resources/js/angular/inspinia/angular-touch.js
	src/main/webapp/resources/js/angular/inspinia/angular-touch.min.js
	src/main/webapp/resources/js/angular/inspinia/angular-touch.min.js.map
	src/main/webapp/resources/js/angular/inspinia/angular.js
	src/main/webapp/resources/js/angular/inspinia/errors.json
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_af-na.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_af-za.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_af.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_am-et.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_am.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ar-001.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ar-ae.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ar-bh.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ar-dz.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ar-eg.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ar-iq.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ar-jo.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ar-kw.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ar-lb.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ar-ly.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ar-ma.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ar-om.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ar-qa.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ar-sa.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ar-sd.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ar-sy.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ar-tn.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ar-ye.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ar.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_bg-bg.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_bg.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_bn-bd.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_bn-in.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_bn.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ca-ad.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ca-es.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ca.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_cs-cz.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_cs.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_da-dk.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_da.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_de-at.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_de-be.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_de-ch.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_de-de.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_de-li.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_de-lu.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_de.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_el-cy.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_el-gr.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_el.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-as.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-au.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-bb.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-be.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-bm.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-bw.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-bz.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-ca.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-dsrt-us.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-dsrt.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-fm.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-gb.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-gu.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-gy.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-hk.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-ie.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-in.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-iso.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-jm.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-mh.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-mp.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-mt.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-mu.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-na.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-nz.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-ph.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-pk.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-pr.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-pw.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-sg.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-tc.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-tt.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-um.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-us.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-vg.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-vi.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-za.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en-zw.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_en.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es-419.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es-ar.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es-bo.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es-cl.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es-co.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es-cr.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es-do.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es-ea.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es-ec.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es-es.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es-gq.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es-gt.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es-hn.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es-ic.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es-mx.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es-ni.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es-pa.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es-pe.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es-pr.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es-py.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es-sv.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es-us.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es-uy.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es-ve.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_es.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_et-ee.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_et.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_eu-es.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_eu.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fa-af.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fa-ir.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fa.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fi-fi.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fi.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fil-ph.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fil.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-be.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-bf.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-bi.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-bj.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-bl.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-ca.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-cd.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-cf.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-cg.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-ch.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-ci.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-cm.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-dj.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-fr.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-ga.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-gf.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-gn.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-gp.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-gq.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-km.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-lu.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-mc.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-mf.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-mg.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-ml.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-mq.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-ne.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-re.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-rw.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-sn.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-td.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-tg.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr-yt.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_fr.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_gl-es.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_gl.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_gsw-ch.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_gsw.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_gu-in.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_gu.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_he-il.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_he.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_hi-in.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_hi.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_hr-hr.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_hr.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_hu-hu.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_hu.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_id-id.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_id.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_in.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_is-is.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_is.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_it-ch.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_it-it.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_it-sm.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_it.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_iw.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ja-jp.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ja.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_kn-in.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_kn.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ko-kr.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ko.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ln-cd.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ln-cg.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ln.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_lt-lt.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_lt.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_lv-lv.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_lv.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ml-in.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ml.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_mr-in.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_mr.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ms-bn.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ms-my.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ms.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_mt-mt.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_mt.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_nl-aw.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_nl-be.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_nl-cw.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_nl-nl.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_nl-sx.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_nl.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_no.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_or-in.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_or.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_pl-pl.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_pl.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_pt-ao.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_pt-br.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_pt-gw.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_pt-mz.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_pt-pt.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_pt-st.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_pt.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ro-md.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ro-ro.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ro.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ru-md.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ru-ru.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ru-ua.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ru.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_sk-sk.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_sk.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_sl-si.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_sl.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_sq-al.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_sq.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_sr-cyrl-ba.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_sr-cyrl-me.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_sr-cyrl-rs.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_sr-cyrl.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_sr-latn-ba.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_sr-latn-me.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_sr-latn-rs.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_sr-latn.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_sr.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_sv-fi.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_sv-se.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_sv.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_sw-ke.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_sw-tz.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_sw.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ta-in.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ta-lk.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ta.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_te-in.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_te.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_th-th.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_th.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_tl.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_tr-tr.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_tr.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_uk-ua.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_uk.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ur-in.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ur-pk.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_ur.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_vi-vn.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_vi.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_zh-cn.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_zh-hans-cn.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_zh-hans-hk.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_zh-hans-mo.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_zh-hans-sg.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_zh-hans.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_zh-hant-hk.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_zh-hant-mo.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_zh-hant-tw.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_zh-hant.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_zh-hk.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_zh-tw.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_zh.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_zu-za.js
	src/main/webapp/resources/js/angular/inspinia/i18n/angular-locale_zu.js
	src/main/webapp/resources/js/angular/inspinia/version.json
	src/main/webapp/resources/js/angular/inspinia/version.txt
	src/main/webapp/resources/js/inspinia/app.js
	src/main/webapp/resources/js/inspinia/config.js
	src/main/webapp/resources/js/inspinia/controllers.js
	src/main/webapp/resources/js/inspinia/directives.js
	src/main/webapp/resources/js/inspinia/inspinia.js
Merge branch 'firefly.tri-accounting.com' into lester.com.firefly.dev
test
Merge branch 'firefly.tri-accounting.dev' into lester.com.firefly.dev

Conflicts:
	tri-accounting.iml
Apply Inspinia to LOGIN page
Apply Inspinia to LOGIN page - change path of firefly image
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 ryan.com.firefly.dev

Conflicts:
	src/main/webapp/WEB-INF/tags/nav.tag
change account columns
rename table names
caching config
implement ehcache
account caching