panier
Merge branch 'master' of https://github.com/adenaud/booxtore-web.git

Conflicts:
	src/main/webapp/css/admin.css
	src/main/webapp/header.jsp