GCP-6320 fix count in export and step 3
Merge branch 'master' of https://github.com/digitalabs/Fieldbook

Conflicts:
	src/main/java/com/efficio/fieldbook/service/ExportExcelServiceImpl.java