replaced progress bar with spinner
Merge branch 'master' into gh-pages