Merge pull request #269 from fangsterr/master

article settings form compatibility with custom user model