Updated the navigationController, so it can be opened from any screen
Merge branch 'master' into feature-split-screen