More updates
	Slight formatting updates..
Merge branch 'master' of github.com:jthompsonNB/PetStore

Conflicts:
	src/main/webapp/addnewproducts.xhtml