[john] - converted hash syntax
[john] - converted hash syntax

Conflicts:
	app/models/email.rb

fightforthefuture/Platform,fightforthefuture/Platform,fightforthefuture/Platform,PurposeOpen/Platform,PurposeOpen/Platform,PurposeOpen/Platform,PurposeOpen/Platform