Merge remote-tracking branch 'pekka/master'
Fix merge.
Update rfid_reader_dll.cpp
Update rfid_reader_dll.h
Merge remote-tracking branch 'tommi/master'

Conflicts:
	ui/users/user.cpp
	ui/users/user.h
Merge remote-tracking branch 'tommi/master'

Conflicts:
	rfid/rfid_reader_dll/rfid_reader_dll.pro
Merge remote-tracking branch 'pekka/master'

Conflicts:
	rfid/rfid_reader_dll/rfid_reader_dll.h
	ui/users/user.h
rfid dll
pro
Merge remote-tracking branch 'tommi/master'

Conflicts:
	inventaari.pro
Refactored the login mechanism.

Reading new card still untested.
Merge remote-tracking branch 'tommi/master'

Conflicts:
	inventaari.pro
	rfid.pro
	ui/mainwindow.cpp
	ui/mainwindow.h
	ui/users/user_management.cpp
	ui/users/user_management.h
Fix merge bug.
Merge remote-tracking branch 'topi/master'

Conflicts:
	rfid/rfid_reader_dll/rfid_reader_dll.h
rfid
Fixed bugs and made rfid more canonical.
saatoa
Merge remote-tracking branch 'topi/master'

Conflicts:
	db/users/login.cpp
selling.*
Added super and normal user.