Merge remote-tracking branch 'origin/develop' into develop

Author: cdujeu

.travis.yml

@@ -1,8 +1,6 @@
 language: php
 
 php:
- - 5.4
- - 5.5
  - 5.6
  - 7.0
 

core/src/plugins/index.elasticsearch/plugin_doc.html

@@ -17,7 +17,7 @@
 - Create an index called "test_index":<br/>
 <pre>$ curl -XPUT 'localhost:9200/test_index'</pre><br/>
 - Then add a document with the type "test_type" with the following command:<br/>
-<pre>$ curl -XPUT 'localhost:9200/test_index/test_type/1 -d '{"user":"test", "message":"this is a test"}'</pre>
+<pre>$ curl -XPUT 'localhost:9200/test_index/test_type/1' -d '{"user":"test", "message":"this is a test"}'</pre>
 This will add a document with id equals to 1 containing two fields "user" and "message" that respective values are "test" and "this is a test".<br/>
 The document will be added in the index "test_index" under the type "test_type".<br/><br/>
 - You can retrieve the documents by their id: