add login/logout feature
Merge branch 'editing' into editing-login

Conflicts:
	nginx.development.conf
Merge pull request #377 from Connexions/editing-login

EDITING: add login/logout feature