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

code refinement and bug fixes
OK
Merge branch 'master' of github.com:dianping/phoenix
op script for alpha and beta environment
add verify step
change env from beta to qa
change default value to product env's default
use service web start/stop to start/stop jboss
Merge pull request #130 from marsqing/master

add op script for alpha and beta environment
make jboss server name configurable
add <jboss-server-name> to readme
use jboss server name from config
Merge pull request #131 from marsqing/master

make jboss server name configurable
rename StandaloneServer to PhoenixAgent
restart container when rolling back to ensure container starts anyway
Merge pull request #132 from marsqing/master

restart container when rolling back to ensure container starts anyway
Merge branch 'master' of github.com:dianping/phoenix into service-container
add layout
make UI work