mod pom.xml for feature1
Merge branch 'master' into r2_master

Bug Fixed
feature 1 finished
merged master feature1