merge in change from generator-angular-foundation