fix npe in project update task
Merge branch 'master' of github.com:dianping/cat
modify the cat sql
modify the login jsp
modify the parameters
Merge branch 'master' of github.com:dianping/cat
baseline issue
modify the validator
modify the version
modify the version
modify the version
transaction bar report granularity change from 5m to 1m
modfiy exception config jsp
granularity change for event & transaction graphs, add report data fetcher test case
change baseline order
modify date format
modify the model jsp
update test cases
Merge pull request #487 from jialinsun/master

baseline issue, transaction bar report granularity change from 5m to 1m
resolve confict