fixed build issues
Merge branch 'master' of github.com:fusesource/fuseide