idea iml file
merge different file
Merge branch 'master' of github.com:wangyj0898/spring-world

Conflicts:
	spring-persist/spring-persist.iml
	spring-web/spring-web.iml
	spring-world.iml
Merge branch 'master' of github.com:wangyj0898/spring-world
Merge branch 'master' of github.com:wangyj0898/spring-world
spring3.x book ch14 spring OXM