Update google trusted stores
Merge branch '2-2-stable' of https://github.com/slikstir/annarbortees-spree into 2-2-stable
Update annarbortees_spree