add first feature 1st wave
add first feature 2nd wave
Merge branch 'first_feature' into develop