fixed some bugs, another fixes are coming
Merge branch 'master' of github.com:innsand/che