updated
Merge branch 'Dev3' into activityindicator
updated activity indicator