CRM-12966, fixed image 2 position
added barcode support, CRM-12966
Merge pull request #1132 from kurund/CRM-12966

CRM-12966