Adapted branch and build layout in navigation header. Added test for the navigation controller.
Merge remote-tracking branch 'origin/master'