Updates

ProvidedService
ProvidedServiceManager
ProviderManager
Merge remote-tracking branch 'origin/master'

Conflicts:
	Choc-A-Holic/src/app/ProvidedService.java