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

Conflicts:
	src/main/java/com/efficio/fieldbook/web/util/AppConstants.java
	src/main/resources/appconstants.propertiesGCP-7937