fixed load indicator
Merge remote-tracking branch 'origin/master'
Merge master to staging for version team city build 1.0.119