adding product edit info
money helper on product edit form
fixed conflicts
Merge branch 'master' into product
added info
Merge pull request #50 from JavaRabbit/product

Product