slight changes to navBar design
Merge remote-tracking branch 'origin/master'

Conflicts:
	eCommerce/WebContent/index.xhtml
	eCommerce/WebContent/templates/info-box.xhtml