Fixed AngularJS routing issue. Deleted TODO lists.
Merge remote-tracking branch 'origin/master'