added progress bar
Merge branch 'dev'

* dev:
  added progress bar