Mendeley OAuth 2.0 + diverse andere Umstellungen und Coderefactorings
Merge branch 'master' of https://github.com/AlexErmer/CollaborativePDFAnnotation

Conflicts:
	web/src/main/web/WEB-INF/config.jsp