-U login
-U logout
-U login handler
-U logout handler
-U message
-U message
Merge branch 'develop_logout' into develop

Conflicts:
	data.txt
	msg.txt