fix load .nib file issue
Merge branch 'feature-laucher' into develop
Merge branch 'develop' of https://github.com/balloonsys/UMO into develop
fix merge conflict issue
fix merge conflicts