commit all
delete build dir
Merge branch 'master' of https://github.com/luckybright/springmvc

Conflicts:
	springmvc/src/config/controllerBeans.xml
yes it is