Started on a unified images function
Merge branch '2-2-stable' into adding-additional-image-links
Made google_shopping initializer do links and images better