Added feature 2
Merge branch 'feature2' into develop (added feature 2)