correctly restore original ADM navigation hack
make tab's urls include its own url
use more descriptive attribute name
also use sidebar subpages in active tab determination
merge master
Merge pull request #814 from dimagi/adm-navigation

correct adm navigation fix