Reorganise the text
Rearranged members page
Fixes merge conflicts
Membership changes
Merge branch 'develop'

q# Lines starting with '#' will be ignored, and an empty message aborts