Sharpened logic for handling attachments and toggling between QR codes ....
Merge pull request #646 from abhinavc/master

Sharpened logic for handling attachments