tree b84dd4380a85038604a048fefc3a05ba5b26a90c
parent a76ed24194a8b8504160d5620a49318b489ed4b2
parent f78a6c6a47ed46217b8813a8c7b7845dcfb1574b
author margaretha <margaretha@ids-mannheim.de> 1495645247 +0200
committer margaretha <margaretha@ids-mannheim.de> 1495645346 +0200

Merge remote-tracking branch 'origin/master' into new-index

Conflicts:
	src/main/java/de/ids_mannheim/korap/resource/rewrite/CollectionRewrite.java
	src/main/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManager.java
	src/main/java/de/ids_mannheim/korap/user/User.java
	src/main/java/de/ids_mannheim/korap/web/service/full/ResourceService.java

Change-Id: I2067b58c279c98915beb0a85462a6f3ea5744f36