Merge branch 'hotfix/2014.04.11.1'
Render media URLs on the FE
Merge branch 'hotfix/2014.04.11.2' into develop