Upgrading Engine
Merge branch 'master' into gh-pages
Fixed compiled version for FF