conflict fix
Merge branch 'master' of https://github.com/kayson/talespin
conflict fix
Merge branch 'master' of https://github.com/kayson/talespin
fixed error in qwidgetlist