activity indicator fixed
Merge branch 'master' into development
Merge pull request #42 from jmr12345/development

update activity indicator