Merge branch 'master' of klin:/home/dpavlin/klin/RFID-Biblio