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

Conflicts:
	js/controllers/applianceTableController.js
	js/controllers/mainController.js
implemented translations
Merge remote-tracking branch 'origin/development' into protoBranch
un-hardcoded the appliance id
Merge remote-tracking branch 'origin/protoBranch' into protoBranch

Conflicts:
	views/applianceTable.html
Revert "Changed url for get appliances"

This reverts commit 8c925b97cc4a34b85785bc3881df28adbe3ff641.
made so a done task parses values to the statuscontroller
merged
made so timer is not using interval  and instead uses watch
Merge remote-tracking branch 'origin/development' into protoBranch
gone remote
changed so we might no longer get a too big interger
Merge remote-tracking branch 'origin/development' into protoBranch
cleaned up some code and made some comments
added check to status opdate
deletede some code
Merge remote-tracking branch 'origin/protoBranch' into development