Change default timeout value
Merge branch 'develop' of https://github.com/islog/liblogicalaccess into develop
Fix an exception message
Merge pull request #63 from madwyn/master

Fix an exception message
Add SetContext method on Rpleth
Avoid Rpleth TCP disconnection if already connected
Merge branch 'develop' of https://github.com/islog/liblogicalaccess into develop
Fix MSVC 2013 compiling error C2440. MSVC doesn't understand return shared_ptr as bool.
Merge branch 'madwyn-master' into develop

Conflicts:
	plugins/pluginsreaderproviders/keyboard/keyboardreaderunit.cpp
	plugins/pluginsreaderproviders/rfideas/rfideasreaderunit.cpp
	src/services/accesscontrol/formats/wiegandformat.cpp
Merge branch 'develop' of https://github.com/islog/liblogicalaccess into develop
Add OMNIKEY 5025 CL Reader Prox compatibility
Fix Wrong calcul in Prox Format detection
Moving read / write function to vector buffer
Last buffer change
Add possibility to read all data of a file in DESFire
Fix mistakes during the change
Update doc and remove unused variable
Fix build
Merge pull request #67 from islog/buffer_change

Change char* buffer to vector for read/write commands
Force Prox card type for OmnikeyXX25 reader