Merge branch 'hotfix' into develop
case 1504 - Use media file selector instead of default one; remove commented code; use alt and title attributes from media file for image campaigns.
Merge remote-tracking branch 'origin/case-1504' into develop
Merge remote-tracking branch 'origin/develop'