fixed the progress bars
Merge remote-tracking branch 'origin/protoBranch' into protoBranch
begin to implement other products
working on tasks
worked on a lot of stuff
Merge remote-tracking branch 'origin/development' into DailyTasks

Conflicts:
	js/controllers/mainController.js
changed view
Merge remote-tracking branch 'origin/development' into DailyTasks

Conflicts:
	translations/en.json
something is not working as planned
Made so daily tasks can now be completed.
added duration time to modal
changed from date to int
Merge remote-tracking branch 'origin/development' into DailyTasks
added duration to the lowprice modal
day done
upgrade appliances, status:DONE
fixed time when modal closed with press to background
Merge branch 'development' into rasmusPromise
Merge branch 'rasmusPromise' into development
cache clearing