Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/iclass.c
	client/Makefile
	client/cmdhficlass.c
	client/loclass/cipher.c
	client/loclass/fileutils.c
	client/loclass/ikeys.h
	include/usb_cmd.h

client/loclass/ikeys.h

@@ -4,11 +4,11 @@
 
 /**
  * @brief
- *Definition 11. Let the function hash0 : F 82 × F 82 × (F 62 ) 8 ? (F 82 ) 8 be defined as
+ *Definition 11. Let the function hash0 : F 82 × F 82 × (F 62 ) 8 → (F 82 ) 8 be defined as
  *	hash0(x, y, z [0] . . . z [7] ) = k [0] . . . k [7] where
  * z'[i] = (z[i] mod (63-i)) + i	i =  0...3
  * z'[i+4] = (z[i+4] mod (64-i)) + i	i =  0...3
- * ? = check(z');
+ * ẑ = check(z');
  * @param c
  * @param k this is where the diversified key is put (should be 8 bytes)
  * @return