Merge branch 'develop' of https://github.com/Deutsche-Digitale-Bibliothek/ddb-next into develop
Merge branch 'develop' of https://github.com/Deutsche-Digitale-Bibliothek/ddb-next into develop
Create Branch for Profile-Page
add profile-url
add profile-template
edit profile page
adapt APIConsumer
User registration page layouting
Merge remote-tracking branch 'origin/develop' into DDBNEXT-480
add AasService
DDBNEXT-543: Structure of registration page
DDBNEXT-477: Login 2
Merge remote-tracking branch 'origin/DDBNEXT-543' into develop

Conflicts:
	grails-app/conf/UrlMappings.groovy
DDBNEXT-477: Login 2
implement calls from/to AAS (including login)
DDBNEXT-477: Login 2
DDBNEXT-477: Login 2
Merge branch 'develop' of https://github.com/Deutsche-Digitale-Bibliothek/ddb-next into develop
DDBNEXT-477: Login 2
Merge branch 'DDBNEXT-477-hla-loginPart2' into develop

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