added condition for loading qr code
fixed qr code to work in chrome
Merge branch 'dev' into partnerplex