changes on hear and sidebar
Merge origin/master

Conflicts:
	src/main/webapp/addAuction.xhtml
final changes