Updating ignore.
Merge remote-tracking branch 'origin/2.0'

Conflicts:
	.gitignore
Updating settings to add spring repositories.