my branch commit 2
Merge branch 'mybranch'

Conflicts:
	mysecond-spring-mvc/src/main/webapp/WEB-INF/spring/root-context.xml
merge conflict
master update 2