fixed tests with custom user model (grappelli 2.6.x), #525
docs updates
Merge branch 'master' into dev/2.6.x