GCP-7906
GCP-7830 initial changes
Merge branch 'branch_save_fieldmap' of https://github.com/digitalabs/Fieldbook into branch_save_fieldmap

Conflicts:
	src/main/resources/Messages.properties
	src/main/resources/Messages_en.properties
Merge branch 'branch_save_fieldmap' of https://github.com/digitalabs/Fieldbook into branch_save_fieldmap