added test for stockCount object and some functions in the controller
added appConfig Mock
updated stock count mock
added ref to queue.js
moved controller from state object
added unit test for stock out broadcast
changed function return format
added product types mock
updated i18n mock
added test when saving stock out data
Merge branch 'develop' into refactor/add-more-unit-test

Conflicts:
	app/scripts/controllers/stock-out-broadcast.js
updated stock out broadcast with new return data format
Bump Font Awesome, closes item:509
Merge pull request #328 from tlvince/refactor/font-awesome-update

Bump Font Awesome, closes item:509
removed deprecated web resource tag from manifest
enabled parallel syncing of multi-stock out alert and syncing of complete object
updated sync-service to enable multiple parallel syncing
Merge pull request #326 from musamusa/refactor/add-more-unit-test

Refactor/add more unit test
Merge pull request #329 from jofomah/bug/multiple-stock-out-sync-bug

Bug/multiple stock out sync bug
Merge branch 'upstream-develop' into feature/intermittent-background-sync

Conflicts:
	app/scripts/services/stock-out-broadcast-factory.js
	app/scripts/services/sync-service.js