VE-1415 Renaming elements shared by template and media's context menu
VE-1413 Moving content to a dedicated file
VE-1412 Adding search term into content
VE-1415 Added logic to handle inline diff
VE-1415 Adding test for editing template
Merge remote-tracking branch 'origin/VE-1413' into VE-1415

Conflicts:
	src/test/java/com/wikia/webdriver/Common/ContentPatterns/VEContent.java
Merge remote-tracking branch 'origin/VE-1413' into VE-1415

Conflicts:
	src/test/java/com/wikia/webdriver/Common/ContentPatterns/VEContent.java
Merge remote-tracking branch 'origin/VE-1413' into VE-1415
Merge pull request #313 from Wikia/VE-1415

VE-1415: Adding test for editing template