mes commandes
Merge branch 'master' of https://github.com/adenaud/booxtore-web
gestion de mes commandes
Merge branch 'master' of https://github.com/adenaud/booxtore-web

Conflicts:
	src/main/java/com/booxtore/www/servlets/Inscription.java
Merge branch 'master' of https://github.com/adenaud/booxtore-web