Merge pull request #204 from bernardchu/master

Add highlighting to navbar. Fix legacy lint errors. Change a href to ui-sref. Master dev view.
Remove redundant ng-controllers.