Merge remote-tracking branch 'centralapp/develop' into bug/fixed-non-displayed-facility-name-in-bundle-preview

Conflicts:
	app/scripts/controllers/bundle.js
	app/views/bundles/partials/bundle-line.html
Merge remote-tracking branch 'centralapp/develop' into general-bug-fixes

Conflicts:
	app/scripts/controllers/bundle.js
Merge remote-tracking branch 'centralapp/develop' into feature/update-facility-selected-product-profile-for-new-product

Conflicts:
	app/scripts/controllers/bundle.js
Merge remote-tracking branch 'centralapp/develop' into feature/update-facility-selected-product-profile-for-new-product

Conflicts:
	app/scripts/controllers/bundle.js
Merge pull request #533 from freefony/feature/update-facility-selected-product-profile-for-new-product

Feature/update facility selected product profile for new product