Merge remote-tracking branch 'origin/master'

Conflicts:

	LAS2peer-Template-Project/src/main/i5/las2peer/services/IMService/IMServiceClass.java
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 6bf819affb42acfe03e3df77f70ca9b84f5ca34f.