Merge branch 'uidev'
fixed a bug widget cannot close just added/moved toward tabs (not clearly...)
Merge branch 'master' into uidev