Merge branch 'cl'

Conflicts:
	src/main/resources/struts.xml
utf8
add sitemesh
add sitemesh
Merge branch 'cl' of https://github.com/hanchilin/SSH.git into cl
cl
Merge remote-tracking branch 'origin/cl'
cl
Merge branch 'cl' of https://github.com/hanchilin/SSH.git into cl
test
Merge remote-tracking branch 'origin/cl2'
cl3
test3
add sitemesh
Merge branch 'master' of https://github.com/hanchilin/SSH.git

Conflicts:
	src/main/resources/struts.xml