added progressbar to angular
merge