Merge remote-tracking branch 'origin/jem' into jem
Merge branch 'jem' into gabriel
Fix list and data entry button
css fix and datepicker
fix data entry modal asset insurance, licenses and warranties
Add asset issuance and transfer page(create and view)
add environment.cashe
asdf
Merge remote-tracking branch 'origin/gabriel' into gabriel
fixed confiicts