Merge branch 'release/v1.1.3' into develop
Merge branch 'release/v1.1.5' into develop
Support event user filtering by type and status
Merge branch 'develop' of github.com:youngrewiredstate/pyrosite into develop

Conflicts:
	VERSION
Correct a mistake with the user filtering
Assigning kids to centres
Bug where contacts cannot be used with an existing email
Fixing admin centres issue
Styling fixes, and a fix for getting attendees by event
Merge branch 'hotfix/event-update' into develop
Version 1.2, not 1.1.5
Merge branch 'release/v1.2'