Issue #10 resolved
Issue #21, #24, #25 resolved
Merge branch 'xslt-master' of https://github.com/DCLP/navigator into xslt-master