Object-oriented refactoring

And so many new language strings
Merge remote-tracking branch 'origin/master'

Conflicts: functions.php