Integrating decorator concerning kind in menu_item
menu_item's url_for now uses menu_kind to return the url
Merge branch 'features/moving-menu-kind-to-nocms-menu'