Merge origin/master

Conflicts:
	DataAccessObject/src/org/adaming/project/dao/ProductDAO.java
	DataAccessObject/src/org/adaming/project/dao/typeT/GeneriqDAO.java
	Test/src/dao/crud.java
Merge origin/master