Merge pull request #603 from balabhv/vb573

Minor changes to minor things
Started working on QR Code implementation using free app pic2shop instead of ZXing.
Started working on QR code and upload dialogs
Merge remote-tracking branch 'upstream/master' into vb573