merge_getServer
Merge remote-tracking branch 'origin/master'

Conflicts:
	.settings/org.eclipse.core.resources.prefs