More Changes
Merge branch 'master' of https://github.com/HippoMarketingGit/leica-hawaii

Conflicts:
	register.html
	register.php
Deans changes