update some templates as in spree 2-2-stable branch