merging
Merge remote-tracking branch 'origin/dev'
merge
hotfix for shows and podcasts page
added note regarding Access-Control-Allow-Origin