bug fix
Revert "bug fix"

This reverts commit f3c1e24933d8034b99e4118e733cc8a8be9ace97.
bug fix
Merge git://github.com/AlloVince/eva-engine into epic
bug fix