comment change
comment change
Merge remote-tracking branch 'refs/remotes/origin/comment_api' into comment_api
fix
comment change
fix
Merge remote-tracking branch 'refs/remotes/origin/comment_api' into comment_api
add
1
more comments
comments fin
comments fin ninja fix
Merge Master and US83
shop custom fields completed;
Merge branch 'master' of github.com:imagecms/ImageCMS
Merge branch 'template' of github.com:imagecms/ImageCMS into template

Conflicts:
	application/modules/shop
merge
Merge branch 'template' of github.com:imagecms/ImageCMS into template
Merge branch 'template' of github.com:imagecms/ImageCMS into template

Conflicts:
	application/modules/shop
	templates/commerce/shop/default/product.tpl
JSON - talking with cart;