changed all instances of shipping to installation
Merge branch 'shipping-to-installation'