bad commit, fix that fast
Merge branch 'master' of https://github.com/etiennepierrot/FeedMyFreebox

Conflicts:
	app/models/episode.rb
	lib/freeboxos_connector.rb