Merge branch 'master' into dev
changes to thanks page
Merge branch 'dev'