Merge branch 'hotfix/PPT-update'
Merge branch 'release/1.3.1'
tables for the contact page & configurable email for generating the 500 error
Merge branch 'release/1.3.2'

Conflicts:
	contact.html
fix contacts table
Merge branch 'hotfix/fix-2' into develop