Fix for partner_platforms
Merge pull request #680 from gannetson/mm_fix

Mm fix
Merge remote-tracking branch 'upstream/master'
Add language to user settings
Switch language to preferred language and store when changed
Highlight selected language