session list page update
handle conflict
Merge branch 'master' of github.com:wondger/eureka

Conflicts:
	app.js
	routes/user.js
	views/layout.jade