renamed product type controller and factory file names
renamed product type controller and factory file names
refactored stock out alert to include stock level in alert
added stock level to sms offline alert refs item:474
updated file name
fixes short presses does not work on hold to count. Refs item:531
add stock level to stock out alerts. refs item:474
minor fix to enable edit on stock count
Merge branch 'upstream-develop' into refactor/stock-outs-with-stock-level

Conflicts:
	app/scripts/services/stock-count-factory.js
fixed counter directive scope digest already in progress error/bug
fixed bug in syncService to enable multiple parallel syncs
added add stock level and save function refs item:474
refactored stock out/low alerts to add stock level and use uniform function.
changed stockout product types variable name to meaningful name
minor refactoring to remove unnecessary codes
added small tests for stock-out-broadcast-factory
Merge pull request #345 from jofomah/refactor/stock-outs-with-stock-level

Refactor/stock outs with stock level