Merge branch 'hotfix/2013_07_03_seo'
Fix invalid URLs in rss feed returned to google
Merge branch 'hotfix/seo_2013_07_04' into develop