GCP-6385, GCP-6386
Merge branch 'master' of https://github.com/digitalabs/Fieldbook

Conflicts:
	src/main/webapp/WEB-INF/pages/LabelPrinting/specifyLabelDetails.html