Vid 1435 preview

merging https://github.com/Wikia/app/pull/2981 to preview branch