Caching issue: fixed
Addition of short codes structure and cart short codes
Implement "Ship to Billing"