added pluralization of unit of measurements.
removed unused UI code
Merge branch 'upstream-develop' into fix/pluralize-units
fixed stock count reminder cache bug
Merge branch 'upstream-develop' into bug/stock-count-reminder-bug

Conflicts:
	app/scripts/services/app-config-service.js
	app/views/discard-count/discard-count-form.html
resolved merge conflict.
Merge pull request #269 from jofomah/bug/stock-count-reminder-bug

Bug/stock count reminder bug