Updated branch w/ elk 5.6.3 and 6.2.2
diff --git a/README.md b/README.md
index 37cec1d..29d471e 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 SensSoft Docker Containers and Website
 --------------------------------------
 
-Specific build instructions located in docker, kubernetes and site folders.
+Specific build instructions located in docker, kubernetes, release and site folders.
 
diff --git a/docker/README.md b/docker/README.md
index 4281566..78edcee 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,7 +1,7 @@
 How to Build SensSoft Docker Containers
 ---------------------------------------
 
-1. Install [``Docker``](http://docker.com) on your machine. Require Docker 1.7 and above.
+1. Install [``Docker``](http://docker.com) on your machine. Requires Docker 1.7 and above.
 
 1. Install ``docker-compose`` in an virtual environment. 
    Full instructions can be found [``here``](https://docs.docker.com/compose/install/).
@@ -121,14 +121,9 @@
    $ docker-compose logs > err.dump 
    ```
 
-TODO
-----
-1. Update Kibana instructions and images. 
-1. Test Kibana visualizations.
-
-[configure_index]: ./images/configure_index.png "Configure Kibana index"
-[confirmation]: ./images/confirmation.png "Confirm index pattern conflicts"
-[dashboard]: ./images/dashboard.png "Apache Senssoft Dashboard"
-[management]: ./images/management.png "Kibana management console"
+[configure_index]: ./docs/images/configure_index.png "Configure Kibana index"
+[confirmation]: ./docs/images/confirmation.png "Confirm index pattern conflicts"
+[dashboard]: ./docs/images/dashboard.png "Apache Senssoft Dashboard"
+[management]: ./docs/images/management.png "Kibana management console"
 
 © Copyright 2016 The Charles Stark Draper Laboratory, Inc. All rights reserved.
diff --git a/docker/images/configure_index.png b/docker/docs/images/configure_index.png
similarity index 100%
rename from docker/images/configure_index.png
rename to docker/docs/images/configure_index.png
Binary files differ
diff --git a/docker/images/confirmation.png b/docker/docs/images/confirmation.png
similarity index 100%
rename from docker/images/confirmation.png
rename to docker/docs/images/confirmation.png
Binary files differ
diff --git a/docker/images/dashboard.png b/docker/docs/images/dashboard.png
similarity index 100%
rename from docker/images/dashboard.png
rename to docker/docs/images/dashboard.png
Binary files differ
diff --git a/docker/images/management.png b/docker/docs/images/management.png
similarity index 100%
rename from docker/images/management.png
rename to docker/docs/images/management.png
Binary files differ
diff --git a/docker/elasticsearch/5.6.3/config/elasticsearch.yml b/docker/elasticsearch/5.6.3/config/elasticsearch.yml
index a245d97..93421af 100644
--- a/docker/elasticsearch/5.6.3/config/elasticsearch.yml
+++ b/docker/elasticsearch/5.6.3/config/elasticsearch.yml
@@ -19,7 +19,6 @@
 node:
   master: ${NODE_MASTER}
   data: ${NODE_DATA}
-  #name: ${NODE_NAME}
   ingest: ${NODE_INGEST}
   max_local_storage_nodes: ${MAX_LOCAL_STORAGE_NODES}
 
diff --git a/docker/kibana/5.6.3/Dockerfile b/docker/kibana/5.6.3/Dockerfile
new file mode 100644
index 0000000..91027a5
--- /dev/null
+++ b/docker/kibana/5.6.3/Dockerfile
@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM docker.elastic.co/kibana/kibana:5.6.3
+
+MAINTAINER Michelle Beard <msbeard@apache.org>
+
+# Override config
+COPY config /usr/share/kibana/config
+
+RUN kibana-plugin remove x-pack
+
+EXPOSE 5601
\ No newline at end of file
diff --git a/docker/kibana/5.6.3/config/kibana.yml b/docker/kibana/5.6.3/config/kibana.yml
new file mode 100644
index 0000000..cc93fed
--- /dev/null
+++ b/docker/kibana/5.6.3/config/kibana.yml
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+server.name: kibana
+server.host: "0"
+elasticsearch.url: http://localhost:9200
diff --git a/docker/kibana/dashboard.json b/docker/kibana/5.6.3/dashboard.json
similarity index 100%
rename from docker/kibana/dashboard.json
rename to docker/kibana/5.6.3/dashboard.json
diff --git a/docker/kibana/visualizations.json b/docker/kibana/5.6.3/visualizations.json
similarity index 100%
rename from docker/kibana/visualizations.json
rename to docker/kibana/5.6.3/visualizations.json
diff --git a/docker/logstash/5.6.3/Dockerfile b/docker/logstash/5.6.3/Dockerfile
new file mode 100644
index 0000000..fb46e5c
--- /dev/null
+++ b/docker/logstash/5.6.3/Dockerfile
@@ -0,0 +1,30 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM docker.elastic.co/logstash/logstash:5.6.3
+MAINTAINER Michelle Beard <msbeard@apache.org>
+
+RUN mkdir /usr/share/logstash/templates
+
+RUN logstash-plugin remove x-pack
+
+# Known issue: https://github.com/elastic/logstash-docker/issues/45
+RUN sed -i '/xpack/d' /usr/share/logstash/config/logstash.yml
+
+# Copy Configuration files over
+COPY config/logstash-userale.conf /etc/logstash/conf.d/logstash-userale.conf
+COPY templates/userale.json /usr/share/logstash/templates/userale.json
+
+EXPOSE 8100
\ No newline at end of file
diff --git a/docker/logstash/5.6.3/config/logstash-userale.conf b/docker/logstash/5.6.3/config/logstash-userale.conf
new file mode 100644
index 0000000..4af6ee7
--- /dev/null
+++ b/docker/logstash/5.6.3/config/logstash-userale.conf
@@ -0,0 +1,53 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+input {
+	http {
+		codec => "json"
+		port => 8100
+		response_headers => { 
+			"Access-Control-Allow-Origin" => "*" 
+            "Access-Control-Allow-Headers" => "Origin, X-Requested-With, Content-Type, Accept"
+        }
+	}
+}
+
+## Add your filters / logstash plugins configuration here
+filter {
+	mutate {
+		remove_field => [ "message", "@version", "headers"]
+	}
+
+	grok {
+    	match => [ "useraleVersion", "(?<major_ver>\d+).(?<minor_ver>\d+)(.(?<patch_ver>\d+))?" ]
+    	match => [ "toolVersion", "(?<tool_major_ver>\d+).(?<tool_minor_ver>\d+)(.(?<tool_patch_ver>\d+))?" ]
+  }
+}
+
+output {
+	# Output data to Elasticsearch instance
+	elasticsearch {
+		hosts => "${ELASTICSEARCH_URL}"
+		index => "userale"
+		document_type => "logs"
+		manage_template => true
+		template_overwrite => true
+		template => "/usr/share/logstash/templates/userale.json"
+		template_name => "userale"
+	}
+
+	# Debug
+	# stdout { codec => rubydebug }
+}
diff --git a/docker/logstash/5.6.3/templates/userale.json b/docker/logstash/5.6.3/templates/userale.json
new file mode 100644
index 0000000..c1bdbb1
--- /dev/null
+++ b/docker/logstash/5.6.3/templates/userale.json
@@ -0,0 +1,150 @@
+{
+    "template": "userale",
+    "order": 1,
+    "settings":
+    {
+        "number_of_shards": 1,
+        "number_of_replicas": 0,
+        "index.refresh_interval": "5s",
+        "analysis": {
+            "analyzer": {
+                "my_analyzer": {
+                    "tokenizer": "my_tokenizer"
+                }
+            },
+            "tokenizer": {
+                "my_tokenizer": {
+                    "type": "path_hierarchy"
+                }
+            }
+        }
+    },
+    "mappings":
+    {
+        "_default_":
+        {
+            "_all":
+            {
+                "enabled": false
+            }
+        },
+        "logs":
+        {
+        "dynamic_templates": [
+                {
+                  "strings_as_keywords": {
+                    "match_mapping_type": "string",
+                    "mapping": {
+                      "type": "keyword"
+                    }
+                  }
+                }
+            ],
+            "dynamic": "true",
+            "properties":
+            {
+                "userAction":
+                {
+                    "type": "boolean"
+                },
+                "clientTime":
+                {
+                    "type": "date",
+                    "format": "strict_date_optional_time||epoch_millis"
+                },
+                "count":
+                {
+                    "type": "integer"
+                },
+                "targetChange": 
+                {
+                    "type": "boolean"
+                },
+                "typeChange": 
+                {
+                    "type": "boolean"
+                },
+                "details":
+                {
+                    "properties":
+                    {
+                        "alt":
+                        {
+                            "type": "boolean"
+                        },
+                        "clicks":
+                        {
+                            "type": "integer"
+                        },
+                        "ctrl": 
+                        {
+                            "type": "boolean"
+                        },
+                        "meta": 
+                        {
+                            "type": "boolean"
+                        },
+                        "shift": 
+                        {
+                            "type": "boolean"
+                        },
+                        "window":
+                        {
+                            "type": "boolean"
+                        },
+                        "x":
+                        {
+                            "type": "integer"
+                        },
+                        "y":
+                        {
+                            "type": "integer"
+                        },
+                        "z":
+                        {
+                            "type": "integer"
+                        }
+                    }
+                },
+                "location":
+                {
+                    "properties":
+                    {
+                        "x":
+                        {
+                            "type": "integer"
+                        },
+                        "y":
+                        {
+                            "type": "integer"
+                        }
+                    }
+                },
+                "major_ver":
+                {
+                    "type": "integer"
+                },
+                "minor_ver":
+                {
+                    "type": "integer"
+                },
+                "patch_ver":
+                {
+                    "type": "integer"
+                },
+                "tool_major_ver":
+                {
+                    "type": "integer"
+                },
+                "tool_minor_ver":
+                {
+                    "type": "integer"
+                },
+                "tool_patch_ver":
+                {
+                    "type": "integer"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file