Merge branch 'dev' into 'master'

.gitignore

app/__init__.py

app/experiment/templates/add_embody.html

app/experiment/templates/experiment_statistics.html

app/experiment/templates/view_experiment.html

app/experiment/views.py

app/models.py

app/routes.py

app/static/css/custom.css

app/static/css/main.css

app/static/js/canvas.js

app/static/js/getCSV.js

app/static/js/getDrawing.js

app/static/js/urls.js

app/task/templates/task.html

app/task/views.py

app/utils.py

config.py

embody_plot.py

plot_image.py