Merge branch 'master' of https://github.com/levalidator/GenartFull
back office
Merge branch 'master' of https://github.com/levalidator/GenartFull

Conflicts:
	build/classes/com/genart/servlets/CartServlet.class