worked on the progressbars
Merge branch 'master' into temp

Conflicts:
	.DS_Store
	gu-bootstrap/.DS_Store
	gu-bootstrap/logotypes/.DS_Store
	npm-debug.log