Bugfix to reinitialize on disabling
Merge branch 'groovy_dev' of github.com:DLu/navigation into groovy_dev