17081 Upgrade to Angular 1.3 + controllerAs/vm pattern

:warning: **Includes commits from #2279. Please review, merge first.**
Line is too long.