instead of original  navigation with ui-view
instead of original  navigation with ui-view
instead of original  navigation with ui-view
Merge branch 'feature/navigation' into develop