bug fix
company
Merge branch 'master' of https://github.com/GiulioGx/Jama.git

Conflicts:
	Jama/src/main/webapp/companyList.xhtml