Merge branch 'master' into develop
Fix field name so project detail images appear. Videos not implemented yet
Merge branch 'develop'