test html
commit
Merge branch 'master' of https://github.com/luckybright/springmvc

Conflicts:
	springmvc/build/classes/config/applicationContext.xml
	springmvc/build/classes/config/controllerBeans.xml