Fixes #86 - Added null guards to address fields on the confirmation page and email
Fixes #54 - Don't render navigation categories if they do not have a URL set
Fix typo
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x

Conflicts:
	site/src/main/resources/emailTemplates/orderConfirmation-email.html
	site/src/main/webapp/WEB-INF/templates/checkout/confirmation.html
Adds Contact Us Page
Readds forgot passwords vars