refactor navigation
resolve conflicts:
Merge branch 'master' of https://github.com/amgaera/emf-forms-rap-showcase