Merge pull request #151 from raviosc/developer125

Developer125
changes done by dev20 for price and custom blocks
Merge pull request #152 from raviosc/developer20

changes done by dev20 for price and custom blocks
changes by dev20
Merge pull request #153 from raviosc/developer20

changes by dev20
changes done by dev20 for buttons
Merge pull request #154 from raviosc/developer20

changes done by dev20 for buttons
Add to cart button on Product page
Merge remote-tracking branch 'origin/master'