Merge origin/master

Conflicts:
	pom.xml
	src/main/java/im/dadoo/logger/client/App.java
	src/main/java/im/dadoo/logger/client/LoggerClient.java
	src/main/resources/logger-client-context.xml