working on db
Merge branch 'development' of https://github.com/mailcrunch/deployment into dbpipe

Conflicts:
	server/main/middleware.js
Got emails piping into db, make sure emails are unique.
Merge branch 'development' of https://github.com/mailcrunch/deployment into dbpipe

Conflicts:
	server/main/middleware.js