Corrige timeout
Merge remote-tracking branch 'origin/master'

Conflicts:
	cocar/session.py