VE-1412 Renaming dialog becasue there is another dialog to edit template
VE-1412 Adding test for the template search functionality
VE-1412 Adding a test to add template with params and template with param
VE-1412 Adding a test to check template inserted into paragaph and onto another block node would insert as block node
VE-142 adding explicit override
VE-1413 Moving content to a dedicated file
Merge branch 'VE-1413' into VE-1412
VE-1412 Adding search term into content
Merge pull request #308 from Wikia/VE-1412

VE-1412 Adding test for template insertions
VE-1414 Adding test to delete template from an article
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
VE-1413 Addressing CR comments
Merge remote-tracking branch 'origin/VE-1413' into VE-1414
VE-1414 Addressing CR. Moving the script to a content file and paramatized it
Merge pull request #312 from Wikia/VE-1414

VE-1414 Adding test to delete template from an article