refactored redundant functions and variables and removed unused functions and variables
changed wasteCount ref name
Merge branch 'develop' into refactor/separate-dry-goods-in-waste-count

Conflicts:
	app/scripts/controllers/waste-count.js
Merge branch 'develop' into refactor/separate-dry-goods-in-waste-count
scope.$watch with change function
minor refactor - added catch to after resolving promise
added onChange() event to counter directive
implemented onChange event
added filter to exclude dry goods from waste count refs item:453
fixed misplaced categories refs item:453
Merge pull request #387 from musamusa/refactor/separate-dry-goods-in-waste-count

Refactor / exclude dry goods from waste count