Merge branch 'feature/make_navigation_more_configurable' into develop

* feature/make_navigation_more_configurable:
  update navigatio
  step1 update (not finished)
Merge branch 'develop' of github.com:Kunstmaan/cupcake into develop

* 'develop' of github.com:Kunstmaan/cupcake: