ProgressIndicator added and Done change to res.getString()
Merge remote-tracking branch 'origin/master'