wanghao:merge code for new joy luancher