Fix conflicts
Update all gems
Add pagination to language quotes page
Fix user link