Merge branch 'feature_e' into development
Revert "Merge branch 'feature_f' into development"

This reverts commit 5a442e7a599fb4c5109a90c6e48e92245b504555, reversing
changes made to 7ae67830cf9d4788896d80fb5f2ad5621283759f.

Conflicts:

	app1/file1.txt
Revert "Revert "Merge branch 'feature_f' into development""

This reverts commit 6718413dd88fbee5928228737977c747bf878743.
feature_f
Merge branch 'feature_f' into development
Revert "Merge branch 'feature_e' into development"

This reverts commit 3420d8344b065817b25116c4ea75961ab4259b56, reversing
changes made to a354e85c9a459864d8f418607e344aa9ffefdb37.
Revert "Revert "Merge branch 'feature_e' into development""

This reverts commit 68fab848665f49925f62a30717fe6ea9426be377.