fixed feature 1
Merge branch 'feature1' into dev