add UserDefined RuleType
Merge branch 'master' of https://github.com/dianping/cat
modify the jsp
Merge pull request #565 from jialinsun/master

refactor a little code
Merge pull request #566 from jialinsun/master

fix scheduledReport issue
modify the invalidate code
react HeartBeat module
add try catch to exceptions which machine can not be found
fix HeartBeatAlert bug
change minute bug
refresh router config
Merge pull request #567 from youyong205/master

modify
add new table UserDefineRule
amend UserDefine rule part
add code to deal with quotes for son
Merge branch 'master' of https://github.com/dianping/cat
Merge pull request #568 from leonindy/master

refactor heartbeat module, add user defined rule type
fix bracket error
refactor summary module's decorator part
add template for alteration summary