optimized js
Merge branch 'em2-master' into em2-stable
optimized js