funding senza ripartizione
Merge branch 'master' of https://github.com/GiulioGx/Jama.git
company
80 pagine magiche
bug fix
company
Merge branch 'master' of https://github.com/GiulioGx/Jama.git

Conflicts:
	Jama/src/main/webapp/companyList.xhtml
filtri uss
Merge branch 'master' of https://github.com/GiulioGx/Jama
approvalDate
bib
company table wip
bib
Merge branch 'master' of https://github.com/GiulioGx/Jama
permesso alter companies
trim fix
Merge branch 'master' of https://github.com/GiulioGx/Jama
fix
fix
biblioi