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