merge on ng-repeat from master