Created activity
Created activity
qwerty
Merge branch 'develop'