SpicsToMeServicesImpl update
Merge branch 'master' of https://github.com/thomaswinckell/spicstome

Conflicts:
	src/com/spicstome/server/services/SpicsToMeServicesImpl.java