Initial merge with ng-boilerplate