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

Conflicts:
	src/main/java/com/efficio/fieldbook/web/fieldmap/bean/UserFieldmap.java
	src/main/java/com/efficio/fieldbook/web/fieldmap/controller/GenerateFieldmapController.java
	src/main/webapp/WEB-INF/pages/Fieldmap/generateFieldmapView.html
Merge branch 'master' of https://github.com/digitalabs/Fieldbook
GCP-6129, GCP-6131
Merge branch 'master' of https://github.com/digitalabs/Fieldbook