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

Conflicts:
	src/main/java/com/efficio/fieldbook/web/util/AppConstants.java
	src/main/resources/appconstants.properties