Merge branch 'master' of https://github.com/dianping/phoenix
Merge pull request #1 from dianping/master

new code
Merge branch 'master' of ssh://github.com/sunryuan/phoenix
add rpm spec and script
Merge branch 'master' of https://github.com/songtong/phoenix
refactor to support web container with several config files,such as tomcat