Major refatoring, upgrade to last version of generator-angular; bug fix grunt task