Added feature_2
Merge branch 'feature_2' into develop (added feature_2)