Added feature-1 specific code
Some change for feature 1
Merge branch 'myfeature-1' into development