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

Conflicts:
	deployments/garage.sale-0.0.1-SNAPSHOT.war
Merge branch 'master' of https://github.com/polinchw/garage.sale.git