Merge pull request #11 from atellwu/develop

修复puma-admin的一些bug
Merge pull request #12 from atellwu/develop

基本完成。
Merge pull request #13 from atellwu/develop

修改version
Merge pull request #14 from atellwu/develop

修复log4j配置；修复lion config类的bug
Merge pull request #15 from atellwu/develop

修改pom.xml依赖puma-core的版本号；修复log4j配置；修改puma-server的配置
binlog bugfix
Merge pull request #16 from leoliang/develop_branch2

binlog bugfix
Merge branch 'develop_branch2' of https://github.com/dianping/puma into develop