Revert "Merge branch 'feature_e' into development"

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

Conflicts:

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

This reverts commit e8b1d1e2400df98a999d177cb49679b7e5dff42b.
fixes for feature_e pulled out of release branch
Merge branch 'feature_e' into release_2013_04_18
Revert "Merge branch 'feature_f' into development"

This reverts commit 5d60b538f4dcb532f2e8533577d0c65860a82779, reversing
changes made to c489b35006488aa4cdd0544ff2a934f1e7919d0c.
Merge branch 'release_2013_04_18'