Merge pull request #708 from jialinsun/master

refactor and update
Merge branch 'master' of https://github.com/dianping/cat
modify the components
modify the transaction type
modify jsp
Merge branch 'master' of code.dianpingoa.com:arch/cat
add project update state label
fix broker-service bug
merge code
modify the tag