replaced ng-include for orig navbar with navbar element in remaining vie...

...ws, updated navbar controller