controller update
Merge branch 'master' of https://github.com/zlatan/rfid_logger

Conflicts:
	app/controllers/events_controller.rb
	app/views/events/index.html.erb
QRCode Update
QRCode Update