update
Merge branch 'master' of github.com:wondger/eureka

Conflicts:
	routes/session.js
permission check for party