Merge branch 've-sprint-6' into VE-552
Merge branch 've-sprint-6' into VE-552
VE-552: add medium priority template tracking.
Merge pull request #1965 from Wikia/VE-552

VE-552: medium priority template dialog tracking