Feature/angular js