GCP-7937 - dynamic value for trial instance no. & make it read only, order variables, hardcoded values for experimental design etc.
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.properties