Mergin Stage into Master

Mergin for deploy

to do:
Migrate static product images to S3 Amazon