wanghao:fix bug issue-15,update joyfolder ui
Merge pull request #147 from lwanghaol/master

wanghao:fix bug issue-15,update joyfolder ui