removing redis
Merge branch 'master' into secure-spa-api

Conflicts:
	package.json
	server.js