----------
Merge branch 'master' of https://github.com/lapth/blogcode.git

Conflicts:
	springmvc.multi.view.resolver/src/main/java/com/lapth82/springmvc/multiresolver/controller/MultiViewController.java