Merge branch 'release/1.1.0' into develop

* release/1.1.0:
  update version to v1.1.0
step1 update (not finished)
update navigatio
Merge pull request #35 from Kunstmaan/feature/make_navigation_more_configurable

Feature/make navigation more configurable
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:
bump
Merge branch 'release/v1.2.0'

* release/v1.2.0:
  bump
  update navigatio
  step1 update (not finished)