Modification
java doc
Merge branch 'master' of https://github.com/marghi/boutik

Conflicts:
	src/test/java/ma/ensa/boutik/dao/ClientDaoTest.java