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