merge with ng-boilerplate