change log level in production
Merge branch 'controlled_vocab'
Broken link on embed player
embed player alignment and logo
Merge pull request #457 from webdevlasse/track-play-count

Track play count
Merge branch 'master' of https://github.com/PRX/pop-up-archive

Conflicts:
	Gemfile
test needed for new controller action