add login and logout function
Merge branch 'origin/master'

Conflicts:
	app/public/js/script.js