Add extra info to cards
Port for local SMTP delivery to 2525, for mailcatcher.
762 Add people to JSON.
Remove duplicate smtp-settings
Port 1025 for mailcatcher, instead of 2525
Merge branch 'develop'

* develop:
  Port 1025 for mailcatcher, instead of 2525
  Remove duplicate smtp-settings
  762 Add people to JSON.
  Port for local SMTP delivery to 2525, for mailcatcher.
  Add extra info to cards

Conflicts:
	app/models/event.rb
	app/views/events/cards.pdf.prawn