Remove Yiliang Lu from the delegate lists
Move upcoming competitions to the top
Merge branch 'develop'