Completing feature e
mergred & fixed commits
feature_e rge remote-tracking branch 'origin/development' into feature_e