test
Merge branch 'master' into HEAD

Conflicts:
	src/main/java/ca/ulaval/glo4003/GLO_4003/web/persistence/DAO.java
	src/main/java/ca/ulaval/glo4003/GLO_4003/web/persistence/ICompanyDAO.java
	src/main/java/ca/ulaval/glo4003/GLO_4003/web/persistence/XMLCompanyDAO.java
retest
essai