Conflicts:
	src/main/java/de/thm/arsnova/dao/CouchDBDao.java
	src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
	src/main/webapp/WEB-INF/spring/arsnova-servlet.xml
	src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
	src/test/resources/arsnova.properties.example

/auth/services now returns the redirection URL instead of pointing
directly to the service.

Added support for an activation webpage and renamed dialog config param
for consistency.