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
Merge remote-tracking branch 'origin/VE-1413' into VE-1415

Conflicts:
	src/test/java/com/wikia/webdriver/Common/ContentPatterns/VEContent.java