Merge pull request #269 from jofomah/bug/stock-count-reminder-bug

Bug/stock count reminder bug
fixed wrong variable name and changed product profile font size
fixed wrong variable name
changed redirect after save
Merge pull request #270 from musamusa/bug/waste-count-total-not-showing

Bug/waste count total not showing
Merge pull request #271 from musamusa/refactor/waste-count-redirect

changed redirect after save
Merge branch 'upstream-develop' into fix/ui-feature-and-bug-fixes

Conflicts:
	app/views/discard-count/discard-count-form.html