UTF-8
Merge branch 'master' of https://github.com/richardaum/XPeopleBus

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