bugfixes
Merge branch 'master' of https://github.com/HSLUStefanBachmann/BDAStefanCurdin

Conflicts:
	LivingWithLightColorsServer/src/ch/hslu/livingWithLightColors/BusinessLogic/RGBToPhilipsHSBConverter.java