before pull
Merge branch 'master' of https://github.com/dianping/cat
Merge pull request #515 from leonindy/master

refactor rule ftl
before pull
before pull
milestone for alert interface
fix some issue
Merge pull request #516 from jialinsun/master

milestone for alert interface
fix some issue
revert cathomemodule
clean log
revert time gap
add monitor content title
Merge pull request #517 from jialinsun/master

fix some issue
change code about comparing time
add more info into web app alert mail
Merge pull request #518 from jialinsun/master

add more info into web app alert mail
add pages for overload monitor page, modify default interval from 1 day to 8 hours
remove invalid code
prevent add duplicate domains to the product line