Completing feature e
feature_e:fixed merge conflicts
Merge branch 'feature_e' into development