Merge branch 'develop' into production -- added content folder for rss feed
Merge branch 'master' into production
Merge branch 'develop' into production
Merge branch 'master' into production

* master:
  added proper title and description to rss channel
Merge branch 'master' into production

* master:
  fixed link in rss feed
Merge branch 'master' into production

* master:
  switched rss feed link to feedburner
Merge branch 'master' into production