Merge branch 'master' into test2

Conflicts:
	web6_spring/readme.txt