brought block branding back, #514
fixed tests with custom user model (grappelli 2.6.x), #525
docs updates
Merge branch 'master' into dev/2.6.x
updated version for 2.6.x to 2.6.2
updated dev version of 2.6.x to 2.6.3
Merge pull request #7 from sehmaschine/master

Update master code