Increase timeout limit on Capybara to minimise intermittent failures.
Increase timeout further.
Update new.html.erb

added a couple of new languages, including Chinese.
added the Oxford comma for Enigel <3
Merge pull request #1604 from priscilladc/patch-1

3958 followup: updating again the list of languages in the Support roster
Fix for the Flat View button; going back to the fandom view should now work correctly.
Issue 3525 - Allow the user to sort by date when clicking the date sort option button on the Stats page.
Merge pull request #1609 from someonefromthewater/issues/3525-missing-sort-by-date-option

Issue 3525 - Sort works by date on stats page when hit counts are disabled
Merge pull request #1608 from someonefromthewater/issues/3164-inconsistent-navigation

Issue 3164 - Fix for Inconsistent Navigation
Update index.html.erb

Pedantry
Automatically load site skins on Test after deploy

It also includes reorganising and tidying up the deploy-defining files. Moved production-only and staging-only tasks to their respective file.
Merge pull request #1613 from CristinaRO/deploy-skins-and-tidy-up

Automatically load site skins on Test after deploy
Issue 3965: replace unicode commas to allow for separate tags
Merge pull request #1615 from elzj/issue_3965_unicode_commas

Issue 3965: replace unicode commas to allow for separate tags
Merge pull request #1591 from ariana-paris/CI_timeout

Increase Capybara timeout for CI servers