f
Merge branch 'master' of https://github.com/hellboyfeng/hellboy.git

Conflicts:
	hellboy-core/hotspot.log
	hellboy-core/src/main/java/com/hellboy/core/base/xml/XmlResearch.java