test
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/dao/IBoutiqueDaoImpl.java
Merge branch 'master' of https://github.com/epitomz/tpecommerce