Merged changes from generator-angular