Continuing comments
Fixing merge conflicts
Merge branch 'development' of https://github.com/mailcrunch/deployment into development

Conflicts:
	client/crunch/crunch.js