Fix/243/new api (closes #243)

Todo: 
- [x] use the clubs table for an event instead of a string (simplifies abilities and enables the use of the `display_name` and `full_name`)
- [x] Merge the organisation and club columns as they both mean the same