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

This reverts commit a13a46e61b3c5353a37b49ab86c34b8a187266d8.
fixing bug
Merge remote-tracking branch 'origin/feature_e' into release_2013_04_18
Merge remote-tracking branch 'world/release_2013_04_18' into release_2013_04_18

Conflicts:
	app1/file1.txt