Merge branch 'deif-blocking-resources' into deploy
Merge branch 'deif-recurring-reservations' into deploy

Conflicts:
	seantis/reservation/db.py
	seantis/reservation/error.py
	seantis/reservation/models/reservation.py
	seantis/reservation/tests/test_db.py
	seantis/reservation/upgrades.py
	seantis/reservation/upgrades.zcml
Merge branch 'deif-recurring-reservations' into deploy
Merge branch 'deif-recurring-reservations' into deploy
Update metadata.xml.
Merge branch 'deif-recurring-reservations' into deploy
Merge branch 'deif-recurring-reservations' into deploy
Merge branch 'deif-recurring-reservations' into deploy

Conflicts:
	seantis/reservation/models/reservation.py
Merge branch 'deif-recurring-reservations' into deploy
Dirty fixes for tamedia.reservation. Please don't merge.
Merge branch 'deif-recurring-reservations' into deploy
Merge branch 'dirty_fixes' into deploy
Fix a typo.
Revert to old permission.
Merge branch 'dirty_fixes' into deploy
Merge branch 'deif-recurring-reservations' into deploy
Fix permission check. Use groups.
Merge branch 'deif-add-separate-approval-mail-setting' into deploy

Conflicts:
	seantis/reservation/profiles/default/metadata.xml
	seantis/reservation/resource.py
	seantis/reservation/upgrades/upgrades.py
	seantis/reservation/upgrades/upgrades.zcml
Merge branch 'deif-add-separate-approval-mail-setting' into deploy
Merge branch 'deif-fix-session-id' into deploy