Finish server prefs layout (for now)
Merge branch 'master' of github.com:ConversationDevelopers/conversation