first setup of cheap price service
Merge remote-tracking branch 'origin/protoBranch' into development
first add
Fixed array position
Merge remote-tracking branch 'origin/protoBranch' into development
Merge remote-tracking branch 'origin/development' into posponeToCheapTime

Conflicts:
	js/controllers/mainController.js
	js/services/services.js
Merge remote-tracking branch 'origin/protoBranch' into posponeToCheapTime
best price working
upgrade appliances, status: NOT DONE
Merge remote-tracking branch 'origin/protoBranch' into development
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	js/services/appliancesService.js
Merge remote-tracking branch 'origin/development' into development
minor casing edit
Save and load status bar data
Save and load status works now
added logout
added date to topbar
added reg-user link
added welcome
working on tasks