[spring-study]merge
Merge branch 'master' of https://github.com/juvhak/spring-study

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml