mapping
enable vcs
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	src/mytests/thymeleafexamples/spring_thyme/MyController.java
messages