Adjusted spam floor time to 8 seconds.
Merge branch 'sendgrid' into dev

Conflicts:
	public/js/bundle.min.js
fixed merge conflict
regenerated javascript