progress bar added
Merge branch 'develop' into gh-pages
added progress bar