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

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

Conflicts:
	armsrc/iso14443a.c
	armsrc/mifarecmd.c
	armsrc/mifareutil.c
	armsrc/mifareutil.h
	client/Makefile
	client/cmddata.c
	client/cmdhfmf.c
	client/cmdhfmfu.c
	client/lualibs/utils.lua
	client/scripting.c
	client/scripts/didump.lua
	client/util.c
	client/util.h
	common/crc16.c
	common/lfdemod.c
	common/sha1.c