Merge branch 'binaryAPI' of git://github.com/yaourt/jedis

Conflicts:
	src/main/java/redis/clients/jedis/Connection.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/ShardedJedis.java

src/test/java/redis/clients/jedis/tests/ShardedJedisPoolTest.java

@@ -57,7 +57,7 @@ public class ShardedJedisPoolTest extends Assert {
     @Test
     public void checkConnectionWithDefaultPort() throws TimeoutException {
         ShardedJedisPool pool = new ShardedJedisPool(shards);
-        pool.setResourcesNumber(10);
+        pool.setResourcesNumber(1);
         pool.init();
 
         ShardedJedis jedis = pool.getResource(200);