fuck git2
Merge remote-tracking branch 'origin/master'

Conflicts:
	auth/src/main/java/at/schuelerz/auth/jsonrpc/RPCServerTest.java
	auth/src/main/java/at/schuelerz/auth/jsonrpc/UserDispatcher.java