logout fix
Merge branch 'master' of github.com:cloice/cloice

Conflicts:
	client/control_panel/control_panel.html
Merge branch 'master' of github.com:cloice/cloice

Conflicts:
	client/control_panel/control_panel.html