39768687 - text updated for login templates pages using Labels.properties
Merge branch 'staging' of https://github.com/bedatadriven/activityinfo into staging

Conflicts:
	server/src/main/resources/template/page/Host.ftl