Merge branch 'deif-add-description-to-reservation' into deploy
Add mail translations.
Remove confusing message part.
Merge pull request #44 from 4teamwork/master

Add recurring reservations.
Merge pull request #45 from 4teamwork/master

Add separate setting for approval mails.
Merge pull request #46 from 4teamwork/master

Fix session id generation.
Merge pull request #47 from 4teamwork/master

Translate user formset labels in mails.
Merge pull request #48 from 4teamwork/master

Add description to reservation.
Increment metadata
Merge remote-tracking branch 'seantis/master'
Merge remote-tracking branch 'seantis/master'
Merge remote-tracking branch 'origin/deif-add-mail-translations'

Conflicts:
	seantis/reservation/locales/de/LC_MESSAGES/seantis.reservation.po
	seantis/reservation/locales/fr/LC_MESSAGES/seantis.reservation.po
	seantis/reservation/locales/seantis.reservation.pot