Merge branch 'development' into plotinclude

Author: adrianq

Dockerfile

@@ -12,7 +12,7 @@ RUN /bin/bash -c "source activate snakes &&  jupyter serverextension enable --py
 RUN /bin/bash -c "source activate snakes && jupyter nbextension enable --py widgetsnbextension"
 
 WORKDIR /home/jovyan
-RUN git clone --branch CNS18 https://github.com/Neurosim-lab/netpyne_workspace
+RUN git clone --branch v0.5 https://github.com/Neurosim-lab/netpyne_workspace
 WORKDIR /home/jovyan/netpyne_workspace
 
 # Uncomment to run travis using this Dockerfile

README.md

@@ -1,10 +1,10 @@
 [![Docker Automated buil](https://img.shields.io/docker/automated/jrottenberg/ffmpeg.svg)](https://hub.docker.com/r/metacell/netpyne-ui/)
 
 <p align="center">
-    <img src="https://raw.githubusercontent.com/MetaCell/NetPyNE-UI/development/docs/NetPyNe.png" width="350px"/>
+    <img src="https://raw.githubusercontent.com/MetaCell/NetPyNE-UI/updated_documentation/docs/netpyne.png" width="350px"/>
 </p>
 
-![Screenshot](https://github.com/metacell/netpyne-ui/raw/master/netpyneui.png)
+![Screenshot](https://github.com/metacell/netpyne-ui/raw/updated_documentation/docs/netpyneui.png)
 
 This repository hosts the User Interface for [NetPyNE](http://www.neurosimlab.org/netpyne/). NetPyNE is a python package to facilitate the development, parallel simulation and analysis of biological neuronal networks using the NEURON simulator.