Merge feature/angularjs.