Merge branch 'develop' -- changes related to adding deployment infrastructure for files optimized and concatenated by requirejs optimization tool.
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop' -- hooked up caption title fields
Merge branch 'develop' -- fixed bug right/left arrows going away wrong times
Merge branch 'develop' -- added content folder for rss feed to repo
Merge branch 'develop' into production -- added content folder for rss feed
Merge branch 'develop' -- fixed type in link to feed in header
Merge branch 'master' into production
Merge branch 'develop' -- fixed urls in feed
Merge branch 'develop' into production
Merge branch 'develop'

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

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

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

* master:
  fixed link in rss feed
Merge branch 'develop'

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

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