must commit?
Merge branch 'master' of https://github.com/xiaohei7012/Demo

Conflicts:
	ssh2/WebRoot/WEB-INF/classes/applicationContext.xml
	ssh2/src/applicationContext.xml