Add logging.
Merge branch 'develop'

Conflicts:
	server.py