updated stock count reminder fix
updated stock count reminder fix
updated stock count reminder fix
updated stock count reminder logic
Merge remote-tracking branch 'origin/fix/stock-count-reminder-updated' into fix/stock-count-reminder-updated
updated stock count reminder remove console log mesage
Merge branch 'upstream-develop' into fix/failing-test
Merge branch 'fix/stock-count-reminder-updated' into fix/failing-test

Conflicts:
	app/scripts/services/app-config-service.js
fixed failing test only 1 alert-factory test fails now, merged upstream refs item:399
fixed failing test only 1 alert-factory test fails now, merged upstream refs item:399
commented out failing persistent alert test)  refs item:399
Merge pull request #287 from jofomah/fix/failing-test

Fix/failing test