make contact form work, exception endpoint, etc.
Merge remote-tracking branch 'origin/master'