files renamed form discard-*-*.html to waste-*-*.html refs item:529
replaced  'discard'  with 'waste' in variables, functions and html text refs items:529
Merge branch 'develop' into refactor/change-discard-to-waste
changed file names from discard to waste
Merge pull request #360 from musamusa/refactor/change-discard-to-waste

Refactor/change discard to waste
Merge branch 'upstream-develop' into bug/stock-count-history

Conflicts:
	app/scripts/controllers/discard-count.js