Move contact section, add javascript form validation
Merge branch 'master' into db_timeouts