0000000000000000000000000000000000000000 dfe96f33b61a35048f1a47f145475d865a77971f root 1455287527 +0100 WIP on develop: 5e3bf51 Merge branch 'feature/old-conference-migration' into develop