updates
Merge branch 'master' of https://github.com/HippoMarketingGit/wdm

Conflicts:
	contact.html