wanghao:merge code for new joy luancher
Merge pull request #24 from lwanghaol/master

wanghao:merge code for new joy luancher