mv locale to the top in instance settings
move display_category_pages to general settings
regular badges before thumbnail badges in instance settings
Merge pull request #722 from xi/feature-mv-instance-settings

mv instance settings