Merge branch 'master-dev'
Fixed hint for Contact person field.
Fixed typos, renamed fields.
Resource type selection moved to the top of the submission page.