merge change
Merge branch 'master' of https://github.com/buckyang/usedcar.git

Conflicts:
	src/main/webapp/WEB-INF/applicationContext.xml