GCP-7939
Merge branch 'branch_save_fieldmap' of https://github.com/digitalabs/Fieldbook into branch_save_fieldmap

Conflicts:
	src/main/webapp/WEB-INF/pages/Common/showAddOrRemoveTraitsPagination.html