Merge branch 'release_2013_04_17'
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
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
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
Merge remote-tracking branch 'origin/release_2013_04_18'