sync with master
Merge branch 'last-episode-preview' of https://github.com/RoxasShadow/mescalina into last-episode-preview

Conflicts:
	app/view/mescalina.rb
	app/view/show.rb