added more test to stock count
first refactoring after linking presentation to product type. Refs item:274
first refactoring after linking presentation to product type. Refs item:274
refactoring product profile, presentation etc fixtures so that batches will be linked to product profile. Refs item:282
updated product profile fixture Refs item:282
updated product profile fixture, Refs item:282
added measles product profile, Refs item:282
product profile updated
Merge branch 'upstream-develop' into refactor/product-profile

Conflicts:
	app/scripts/fixtures/product_types.json
	test/spec/services/stockcountfactory.js
Merge pull request #140 from jofomah/refactor/product-profile

Refactor/product profile