Merge branch 'master' into development

* master:
  Adjust API to work with Guzzle 6
  Change guzzle version to ~6.0
  Added docs to explain how to use markdown to display images

# Conflicts:
#	composer.lock

libs/Format/Confluence/Api.php

@@ -24,10 +24,14 @@ class Api
         $this->space = $space_id;
     }
 
-    protected function getClient()
+    /**
+     * This method is public due to test purposes
+     * @return Client
+     */
+    public function getClient()
     {
         $options = [
-            'base_url' => $this->base_url . 'rest/api/',
+            'base_uri' => $this->base_url . 'rest/api/',
             'defaults' => [
                 'auth' => [$this->user, $this->pass]
             ]