fixing bad merge
Merge branch 'master' of https://github.com/ctesene/generator-angular

Conflicts:
	script-base.js