catalogue
Merge remote-tracking branch 'origin/master'

Conflicts:
	jee/tpecommerce/src/main/java/testBDD.java