Bug#949 - Las tarjetas terminadas en 2 fallas
BUG#950 -Added price
BUG#950 -Added price
Merge branch 'BUG#950'
merge confilt