last changes
Merge remote-tracking branch 'origin/users_2' into user
Connected users
Merge branch 'master' into user

Conflicts:
	boards.py
	messages.py
Remove prints
Merge pull request #2 from mapale/user

User