changed path and encoding and fix for free shipping
template changes showing secretword
Merge remote-tracking branch 'origin/develop' into develop