Final fixes

Fixed email form
Fixed project links
Merge branch 'master' into gh-pages