Revert "Merge branch 'feature_e' into development"

This reverts commit b7d33183c26d46d5332207810501962d4db11818, reversing
changes made to 20742dc7e7a0c97f4d585bc146cef6ece97e8de8.

Conflicts:

	app1/file1.txt