Updated
Merge branch 'master' of https://github.com/polinchw/garage.sale.git

Conflicts:
	src/main/webapp/addSale.xhtml