Merge branch 'develop'

irst merge
Merge branch 'develop'
 Please enter a commit message to explain why this merge is necessary,
 especially if it merges an updated upstream into a topic branch.
implement feature1 activity
Merge branch 'feature-1' into develop
merge with feature-1 branch