removed log messages
merged upstream
fixed stock counting unit bug
Merge pull request #261 from musamusa/bug/stock-count-list

fixed variable name
added background syncing of stock count. Refs item:408
added background syncing of discard count. Refs item:408
Merge branch 'develop' into refactor/stock-discard-count
Merge pull request #264 from jofomah/fix/sync-background

Fix/sync background
Merge branch 'develop' into refactor/stock-discard-count

Conflicts:
	app/scripts/controllers/stockcount.js