Merge branch 'hotfix/admin_nullpoint'
Merge pull request #9 from markerking/master

修复admin没有consumer时出现空指针异常
update versions
Merge branch 'master' of http://github.com/dangdangdotcom/dubbox
完善jackson序列化，改进对继承bean的支持
update docs
Merge pull request #11 from dinguangx/master

完善jackson序列化，改进对继承bean的支持
update docs
Merge branch 'master' of http://github.com/dangdangdotcom/dubbox
update docs
change rest logging
change rest logging
change demo config
set basedir for tomcat http server
update docs
Merge branch 'master' into develop