Merge pull request #824 from leider/master

dependencies updated (frontend)
minor lay outing tweaks - jquery.qrcode update