Merge remote-tracking branch 'upstream/develop' into HEAD

Conflicts:
	.gitignore
	app/index.html
	app/manifest.json
	app/scripts/services/uomfactory.js
	app/views/app-config/edit-configuration.html
	app/views/app-config/partials/forms/ccu-profile.html
	app/views/app-config/partials/forms/product-profile.html
	app/views/app-config/welcome-page.html
	app/views/app-config/wizard/partials/email-setup.html
	app/views/app-config/wizard/partials/facility-cce-profile-setup.html
	app/views/app-config/wizard/partials/facility-contact-person.html
	app/views/app-config/wizard/partials/facility-info.html
	app/views/app-config/wizard/partials/facility-product-profile.html
	app/views/app-config/wizard/partials/facility-survey.html
	app/views/batches/add-batch-form.html
	app/views/batches/index.html
	app/views/bundles/partials/bundle-lines.html
	app/views/bundles/partials/enter-bundle-no.html
	app/views/bundles/partials/log-automatically.html
	app/views/bundles/partials/log-incoming-preview.html
	app/views/cold-chain-units/report-ccu-breakdown.html
	app/views/dashboard/dashboard.html
	app/views/dashboard/partials/stock-out-warning.html
	app/views/facilities/index.html
	app/views/home/dashboard.html
	app/views/home/main-activity.html
	app/views/home/partials/discard-count-reminder.html
	app/views/home/partials/stock-count-reminder.html
	app/views/home/partials/survey-reminder.html
	app/views/home/settings.html
	app/views/index/footer.html
	app/views/index/header.html
	app/views/inventory/index.html
	app/views/notification-service/confirm-dialog.html
	app/views/orders/place-order.html
	app/views/partials/group_about_to_expire_in_months.html
	app/views/partials/notifications.html
	app/views/partials/search.html
	app/views/product-types/add-product-type.html
	app/views/product-types/product-types-list.html
	app/views/programs/product_profile.html
	app/views/programs/product_profile_form.html
	app/views/programs/program_form.html
	app/views/programs/program_product_form.html
	app/views/reminder/reminder-notification.html
	app/views/stock-count/index.html
	app/views/stock-count/stock-count-form.html
	app/views/stock-out-broadcast/stock-out-broadcast.html
	app/views/survey/take-survey.html
	app/views/waste-count/waste-count-form2.html
	app/views/waste-count/waste-count.html