Move confirmation link in acceptance mail to below the legalese #741
Merge pull request #9 from sonologic/master

Fix email
Merge branch 'develop'

* develop:
  Add unscheduled events namespace in JSON
fixes XSS related to bootstrap popover in recent changes
Add extra info to cards
Mail template changed to resemble variables we actually have.
Hotfix: avoid fail when no coordinator marked.
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
Merge branch 'develop'

* develop:
  803 only confirmed events in public schedule
  Change-request: don'e show gender in public JSON
Merge branch 'develop'

* develop:
  Link to new report from report-menu.
  Introduce report for people without events.
  Count the actual amount found, not the amount before search.
  Whitespace fix
Merge branch 'develop'

* develop:
  Issue 764: Schedule not rendered correct.
Issue 764: attempt to see if the compression causes the error.
Make sure the timezone is used for rendering the calendar grit.
Only confirmed events.
Merge branch 'hotfix/confirmed-json' into develop

* hotfix/confirmed-json:
  Only confirmed events.
  Make sure the timezone is used for rendering the calendar grit.
  Issue 764: attempt to see if the compression causes the error.
  Hotfix: avoid fail when no coordinator marked.
  Mail template changed to resemble variables we actually have.
  Add extra info to cards
  fixes XSS related to bootstrap popover in recent changes
  Move confirmation link in acceptance mail to below the legalese #741