Update to Rails 3.2 + gem fixes
Refactor Calendar view/controller
Don't import extras anymore
Merge branch 'master' of github.com:Frexuz/EpisodeCalendar3

Conflicts:
	app/models/episode.rb