GCP-8528
Merge branch 'master' of https://github.com/digitalabs/Fieldbook

Conflicts:
	src/main/webapp/WEB-INF/static/js/fieldbook-common.js