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

gemeinsamforschen/pom.xml

...n/src/main/java/unipotsdam/gf/interfaces/Annotatable.java

...chen/src/main/java/unipotsdam/gf/interfaces/Feedback.java

...rc/main/java/unipotsdam/gf/interfaces/ICommunication.java

...in/java/unipotsdam/gf/interfaces/IContributionReview.java

...chen/src/main/java/unipotsdam/gf/interfaces/IJournal.java

...in/java/unipotsdam/gf/interfaces/IProjectDescription.java

...ain/java/unipotsdam/gf/modules/annotation/Annotation.java

...sdam/gf/modules/communication/model/chat/ChatMessage.java

...potsdam/gf/modules/communication/model/chat/ChatRoom.java

.../unipotsdam/gf/modules/communication/model/user/User.java

.../gf/modules/communication/model/user/UserCredentials.java

...communication/model/user/UserRegistrationInformation.java

...main/java/unipotsdam/gf/modules/journal/JournalEntry.java

...tsdam/gf/modules/peer2peerfeedback/Peer2PeerFeedback.java

...en/src/main/webapp/assets/bootstrap/css/bootstrap.min.css

...p/assets/bootstrap/fonts/glyphicons-halflings-regular.eot

...p/assets/bootstrap/fonts/glyphicons-halflings-regular.svg

...p/assets/bootstrap/fonts/glyphicons-halflings-regular.ttf

.../assets/bootstrap/fonts/glyphicons-halflings-regular.woff