Merge branch 'master' into dev
Revert "VE-1333 Adding tests to resize media nodes"
Merge pull request #260 from Wikia/revert-257-VE-1333

Revert "VE-1333 Adding tests to resize media nodes"
VE-1333 Fixes from CR
Merge branch 'master' into VE-1333
Merge branch 'master' into VE-1333

Conflicts:
	src/test/java/com/wikia/webdriver/PageObjectsFactory/PageObject/VisualEditor/VisualEditorPageObject.java
	src/test/java/com/wikia/webdriver/TestCases/VisualEditor/VEMediaTests.java
More screenshot comparison tests
Merge pull request #262 from Wikia/more-screenshot-comparison-ad-tests

More screenshot comparison tests
VE-1333 Debug on Stale Element Exception when clicking on context menu
Merge branch 'preview'
VE-1333 fixes from CR comment
VE-1333 fixes from CR comment
Merge pull request #261 from Wikia/VE-1333

VE-1333 Adding tests to resize media nodes
Merge pull request #258 from Wikia/QAART-381

QAART-381 Refactoring VE dialogs
Merge pull request #263 from Wikia/VE-1407

VE-1407 Adding test to add category to an article
Merge branch 'master' into VE-1408