Revert "Merge remote-tracking branch 'origin/feature_e' into development"

This reverts commit 4625951cb0864f3781a0c338fcaa0bc51378d4d0, reversing
changes made to 20742dc7e7a0c97f4d585bc146cef6ece97e8de8.
Merge remote-tracking branch 'world/release_2013_04_18' into release_2013_04_18

Conflicts:
	app1/file1.txt