add .main to component-create(1) generated component.json
fix UMD: use this instead of window for global
Merge remote-tracking branch 'upstream/master'