Merge branch 'John'
Merge branch 'John'
changed prog bar font to open sans

changed prog bar font to open sans
Merge branch 'master' into John