fix bug timeout-p
Merge branch 'naryl' into dev

Conflicts:
	src/users.lisp
Merge branch 'dev' into users