ignore Spring Plug's config file
Merge remote-tracking branch 'origin/master' into WebDemo

Conflicts:
	.gitignore