Removed Extended Shopping Rule
Merge remote-tracking branch 'origin/branch_PsychoTeras'