Re-add logback but don't include it in the jar-file (maven build)
Merge branch 'dev' into Android

Conflicts:
	org.hive2hive.client/src/main/resources/logback.xml