tweaks to work on EC2 instance
added condition for loading qr code
Merge branch 'dev' into partnerplex