remove output from shell
Merge branch 'master' of github.com:dianping/phoenix
Merge pull request #205 from leoliang/master

remove output from shell
Merge pull request #206 from marsqing/master

for hua to sync
Merge pull request #207 from marsqing/master

ready for demo
将launch文件放到项目根目录
不要打package名
增加citylist映射
modify workspace
Merge pull request #209 from leoliang/master

modify workspace
rescan lion properties after modified project
Merge pull request #210 from leoliang/master

rescan lion properties after modified project
将launch文件放到项目根目录