rfid dll
pro
Merge remote-tracking branch 'tommi/master'

Conflicts:
	inventaari.pro
Merge remote-tracking branch 'topi/master'

Conflicts:
	rfid/rfid_reader_dll/rfid_reader_dll.h
rfid
saatoa
Merge remote-tracking branch 'topi/master'

Conflicts:
	db/users/login.cpp
selling.*
Added super and normal user.
Merge remote-tracking branch 'pekka/master'