VE-1499: Tracking for template insertion
VE-1541: Build the preference info dialog
VE-1546: Translations for template tools
VE-1389 Script to transition some users to VisualEditor
VE-1365 Display fixes in template edit dialog
VE-1389 Rename user option
VE-1552 Show VE transition dialog based on user option
VE-1552 Explicitly check for integer
VE-1541: Using correct message
VE-1545 Fix broken pluralization in i18n message
VE-1545 Use built-in number formatting in message engine
Merge pull request #4857 from Wikia/VE-1545

VE-1545 Fix broken pluralization in i18n message
Merge pull request #4856 from Wikia/VE-1552

VE-1552 Show VE transition dialog based on user option
Merge pull request #4805 from Wikia/VE-1499

VE-1499: Tracking for template insertion
VE-1389 Database changes, use FluentSQL
VE-1541: Make mergeable
VE-1541: Pass surface when opening window
VE-1541: Retina quality graphic
Merge branch 've-sprint-27' into VE-1546

Conflicts:
	extensions/VisualEditor/wikia/VisualEditor.i18n.php
VE-1389 Update query