Makes Option Include in Menu working
Add notes on XML being overridden

A layout update and block rewrite in this module are overridden by versions in
the Webcomm_BootstrapNavigation module. This allows both extensions to work
together, while still letting this extension function if
Webcomm_BootstrapNavigation is disabled.
Merge branch 'master' into mercator