partial support xiaojun
Merge branch 'master' of github.com:dianping/phoenix
support customized lion config
Merge pull request #242 from leoliang/master

partial support xiaojun & support customized lion config