Merge remote-tracking branch 'origin/archer-2.0' into github

# Conflicts:
#	sql/query.py
#	sql/static/slowquery.html
#	sql/static/sqladvisor.html
#	sql/views.py
#	sql/views_ajax.py
#	src/docker/Dockerfile
#	src/docker/nginx.conf
#	src/docker/startup.sh
#	startup.sh