templates merge
static files merge
admin merge
fixed placeholder tests admins
some tests fixed
toolbar merge
various fixes
other tests fixed
fixed plugin move test cases
fixed admin tests
and whole lot of other tests fixed
toolbar test fixes
plugin tests fixed
and some other tests fixed
plugin tests fixed
fixed reversion tests
all tests passing :)
fixes toolbar import errors
fixes django 1.5 errors
docs