Add a modification about spring boot samples
Merge remote-tracking branch 'origin/master'

Conflicts:
	boot/boot.iml
	springdemo.iml
Update auto-import java class