Minor changes.
Merge branch 'master' of https://github.com/dgitz/icarus_drone_server

Conflicts:
	scripts/trainnets.py