Partial 'self recovery' stuff in JS builder
Merge branch 'master' of https://github.com/CharlotteGore/CommonJSComponentBuilder