Merge remote-tracking branch 'remotes/origin/development_master' into Journal

.gitignore

.gitignore.orig

.idea/workspace.xml

gemeinsamforschen/pom.xml

...orschen/src/main/java/unipotsdam/gf/config/Constants.java

...c/main/java/unipotsdam/gf/config/GFApplicationBinder.java

.../src/main/java/unipotsdam/gf/config/GFDatabaseConfig.java

.../src/main/java/unipotsdam/gf/config/GFResourceConfig.java

.../java/unipotsdam/gf/core/database/mysql/MysqlConnect.java

...otsdam/gf/core/database/mysql/VereinfachtesResultSet.java

...c/main/java/unipotsdam/gf/core/management/Management.java

...in/java/unipotsdam/gf/core/management/ManagementImpl.java

.../main/java/unipotsdam/gf/core/management/group/Group.java

...n/java/unipotsdam/gf/core/management/project/Project.java

...ava/unipotsdam/gf/core/management/user/HiddenUserTag.java

...rc/main/java/unipotsdam/gf/core/management/user/Menu.java

.../unipotsdam/gf/core/management/user/SessionValidator.java

...rc/main/java/unipotsdam/gf/core/management/user/User.java

.../java/unipotsdam/gf/core/management/user/UserService.java

.../unipotsdam/gf/core/management/user/UserService.java.orig