Fix import
Partially merge from Android branch
Merge branch 'dev' into Android

Conflicts:
	org.hive2hive.client/src/main/resources/logback.xml
	org.hive2hive.core/src/main/java/org/hive2hive/core/network/IPeerHolder.java