modified
Merge https://github.com/ssthil/AngularJS-Yeoman