Signed-off-by: badqiu <badqiu@gmail.com>
Merge branch 'master' of https://github.com/badqiu/rapid-queue.git

Conflicts:
	queue-server/src/main/java/com/google/code/rapid/queue/server/Client.java
	queue-server/src/main/java/com/google/code/rapid/queue/server/Server.java
	queue-server/src/main/java/com/google/code/rapid/queue/server/impl/MessageBrokerServiceImpl.java