commit by cl
add edit_account
edit some files
modify something
add
Merge branch 'cw'
Merge branch 'master' of https://github.com/hanchilin/SSH
edit something
Merge branch 'master' of https://github.com/hanchilin/SSH.git

Conflicts:
	src/main/webapp/login.jsp
	src/main/webapp/loginsuc.jsp
test
add read me
修改ticketDao
Merge branch 'master' into cw