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

Conflicts:
	armsrc/lfops.c
	client/cmddata.c
	client/cmdlf.c
	client/cmdlft55xx.c
	client/cmdlft55xx.h
	client/scripts/test_t55x7_bi.lua

client/scripts/test_t55x7_bi.lua

@@ -129,4 +129,4 @@ local function main(args)
 	test()
 	print( string.rep('--',20) )
 end
-main(args)
+main(args)

client/scripts/test_t55x7_psk.lua

@@ -168,4 +168,4 @@ main(args)
 
     -- XXXXX0XX = PSK RF/2
     -- XXXXX4XX = PSK RF/4
-    -- XXXXX8XX = PSK RF/8
+    -- XXXXX8XX = PSK RF/8