Contact us and feedback updated still contact us remains
Merge remote-tracking branch 'origin/master' into testing