Messy big and laggy android app
Merge branch 'master' into QRScan