Merge branch 'master' into puzzle2

* master:
  upgrade to play framework 2.3.4
  deploy to hexal
  fix elasticsearch deprecation warning

bin/install-stockfish

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/sh
 
 mkdir -p local
 cd local

bin/prod/deploy

@@ -17,9 +17,9 @@ elif [ $mode = "salim" ]; then
 elif [ $mode = "salim2" ]; then
   REMOTE="salim2"
   REMOTE_DIR="/home/lila"
-elif [ $mode = "lizen" ]; then
-  REMOTE="lizen"
-  REMOTE_DIR="/home/lila5"
+elif [ $mode = "hexal" ]; then
+  REMOTE="hexal"
+  REMOTE_DIR="/home/lila"
 elif [ $mode = "matthews" ]; then
   REMOTE="matthews"
   REMOTE_DIR="/home/thibault/lila"

modules/search/src/main/ElasticSearch.scala

@@ -10,9 +10,11 @@ object ElasticSearch {
   // synchronously create index and type, ignoring errors (already existing)
   def createType(client: ElasticClient, indexName: String, typeName: String) {
     try {
-      client.sync execute {
+      import scala.concurrent.Await
+      import scala.concurrent.duration._
+      Await.result(client execute {
         create index indexName
-      }
+      }, 10.seconds)
     }
     catch {
       case e: Exception => // println("create type: " + e)

project/plugins.sbt

@@ -1,6 +1,6 @@
 resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
 
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.3")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.4")
 
 // addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.6")