Merge branch 'master' of https://github.com/ecohackepi/visualepi

Conflicts:
app/views/application/.index.html.erb.swp