Added shop page
Merge hub/Spring into Spring