fix f/e js issues
Merge branch 'master' of github.com:inventures/hatchjs