Don't count items not in nav
Merge branch 'develop' of https://github.com/blueriver/MuraCMS into develop