fixed the progress bars
Merge remote-tracking branch 'origin/protoBranch' into protoBranch
begin to implement other products
working on products - finished view part
cost is now substracted from the balance
Merge remote-tracking branch 'origin/development' into protoBranch

Conflicts:
	index.html
	js/controllers/statusController.js
	views/mainView.html

Merged develop into protobranch
accidencly added an existing view a second time
fixed modal is it starts time the right way
Merge remote-tracking branch 'origin/protoBranch' into development