working
Merge remote-tracking branch 'origin/protoBranch' into protoBranch

Conflicts:
	js/controllers/applianceTableController.js
	js/controllers/timeController.js