2014-5-4 21：48测试
Merge branch 'master' of https://github.com/XTracker/Doter