Merge branch 'master' into update_4x50

merged 201206

client/src/cmdlfem4x50.h

@@ -13,6 +13,8 @@
 
 #include "em4x50.h"
 
+int CmdLFEM4X50(const char *Cmd);
+
 int read_em4x50_uid(void);
 bool detect_4x50_block(void);
 int em4x50_read(em4x50_data_t *etd, em4x50_word_t *out);