added angular and ranking
Merge branch 'feature/angular' into develop