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

This reverts commit dc92929ca25ecdac61b3ff6ced39b67f904b8e5c, reversing
changes made to 8f2433dbf6ecd23b2c500525ea320d816262b8fe.
tMerge remote-tracking branch 'world/release_2013_04_18' into release_2013_04_18

Conflicts:
	app1/file1.txt