Settings fix for admin model conflicts
Merge branch 'master' of github.com:podcastquotes/podcastquotes