Merge branch 'master' of /Users/mgradob/PycharmProjects/CITA Kiosk/LockersApi with conflicts.