DDBNEXT-477: Login 2
DDBNEXT-477: Login 2
DDBNEXT-477: Login 2
DDBNEXT-477: Login 2
DDBNEXT-477: Login 2
Merge branch 'DDBNEXT-477-hla-loginPart2' into develop

Conflicts:
	grails-app/conf/ApplicationResources.groovy
	grails-app/conf/UrlMappings.groovy