add logout model
ogg
dd
ood
111
up
Merge branch 'develop'

Conflicts:
	login.c