Added brick grappelli
added pluggable urls, admin plugin
Merge branch 'master' into grappelli
updated grapelli plugin
fixed grappelli plugin; needs admin plugin disabled