upgrade appliances, status: NOT DONE
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	js/services/appliancesService.js
Merge remote-tracking branch 'origin/development' into development