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
modify the validator
modify the version
modify the version
modify the version
modify the model jsp
resolve confict
Merge pull request #488 from youyong205/master

modify the version