Completing feature e
Merge branch 'development' into feature_e

Conflicts:
	app1/file1.txt
Merge branch 'feature_e' into development