Merge branch 'master' into uidev
added small loading indicator
Merge branch 'hotfix' into uidev
Merge branch 'hotfix' into uidev
Merge branch 'uidev'