Saving work before pull
Merge remote-tracking branch 'origin/master'
Changes with new controller state. All qrcode scans now go to addtooltableviewcontroller