Merge branch 'master' into dev
VE-1411 Adding test for category suggestion when adding a new category
Merge branch 'preview'
VE-1417 Adding test to verify edit summary on the article history page
Merge pull request #267 from Wikia/VE-1411

VE-1411 Adding test for category suggestion when adding a new category
Merge branch 'master' into VE-1409

Conflicts:
	src/test/java/com/wikia/webdriver/PageObjectsFactory/ComponentObject/VisualEditorDialogs/VisualEditorOptionsDialog.java
	src/test/java/com/wikia/webdriver/TestCases/VisualEditor/VECategoryTests.java