fixed feature 2
merging dev into branch before commit
Merge branch 'feature2' into dev