Update composer packages
prepare for more emails
Updated copy
Merge remote-tracking branch 'origin/master' into eemail2

Conflicts:
	public/index.php
Merge pull request #1 from EESoc/eemail2

Eemail2