added logout
Merge branch 'master' of github.com:Kilhwch/Ohtu1

Conflicts:
	app/scripts/controllers/list.js
Merge branch 'master' of github.com:Kilhwch/Ohtu1
fixed a test
Merge branch 'master' of github.com:Kilhwch/Ohtu1