Progress bar migration
Merge branch 'master' of https://github.com/jgat2012/WebADT

Conflicts:
	assets/scripts/migration.js