Some Todos.
Merge remote-tracking branch 'origin/angularjsImplementation' into angularjsImplementation