Merge origin/master

Conflicts:
	src/main/java/im/dadoo/logger/server/App.java
	src/main/resources/logger-server-context.xml