update Canvas size
Merge branch 'master' of https://github.com/JohnnyLe/proj1

Conflicts:
	pica/app/code/local/SM/Picasso/Block/Override/Catalog/Product/View/Options.php
	pica/app/design/frontend/picasso/default/template/sm/picasso/catalog/product/view/options.phtml
update