fix navigate view
Merge commit 'ca2013ecce433d1d961a81a2bca676ce49a06b0c'
Merge branch 'master' of https://github.com/signumsoftware/framework