replaced ng-include for orig navbar with navbar element in remaining views, updated navbar controller
Merge pull request #6 from lizlongnc/dev_liz

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