Merge branch 'master' of /Users/mgradob/PycharmProjects/CITA Kiosk with conflicts.
Merge remote-tracking branch 'origin/master'
Update 2.
Added printer controller.
Added functionality to Frontend.
Added communication with SALTO:
  - Read credential.
  - Write access.
  - Write to credential.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Frontend/html/app.js