update
Merge branch 'master' of https://github.com/klemon/passtor

Conflicts:
	server/app/routes/security.js