Revert "Merge branch 'feature_e' into development"

This reverts commit 3420d8344b065817b25116c4ea75961ab4259b56, reversing
changes made to a354e85c9a459864d8f418607e344aa9ffefdb37.
Revert "Revert "Merge branch 'feature_e' into development""

This reverts commit 68fab848665f49925f62a30717fe6ea9426be377.
feature_e:fixed bug
Merge branch 'feature_e' into release_18_04_2013
Merge remote branch 'world/release_18_04_2013' into release_18_04_2013