reduce unnecessary method in DisplayPolicyManager
refactor heartbeat alert's query configs method
Merge branch 'master' of github.com:dianping/cat
Merge pull request #693 from leonindy/master

make some changes
merge code