Merge remote-tracking branch 'upstream/master' into pm3+reveng

Conflicts:
	client/Makefile

diff --cc client/Makefile
index bd8b891fd5926650ed83ba6209db64f7056a3872,c454533d7822ca63febae2f6152a28f4480cb0bf..ea532099e5ed6fde8eb89003831a1af72cadb7f4
--- 1/client/Makefile
--- 2/client/Makefile
+++ b/client/Makefile
@@@ -103,20 -103,19 +103,26 @@@ CMDSRCS =       nonce2key/crapto1.c
                        aes.c\
                        protocols.c\
                        sha1.c\
 +                      cmdcrc.c\
 +                      reveng/reveng.c\
 +                      reveng/cli.c\
 +                      reveng/bmpbit.c\
 +                      reveng/model.c\
 +                      reveng/poly.c\
 +                      reveng/getopt.c\
  
+ ZLIBSRCS = deflate.c adler32.c trees.c zutil.c inflate.c inffast.c inftrees.c
+ ZLIB_FLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED 
+ #-DDEBUG -Dverbose=1
+ 
+ 
  COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
  CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
+ ZLIBOBJS = $(ZLIBSRCS:%.c=$(OBJDIR)/%.o)
  
  RM = rm -f
- BINS = proxmark3 flasher #snooper cli
- CLEAN = cli cli.exe flasher flasher.exe proxmark3 proxmark3.exe snooper snooper.exe $(CMDOBJS) $(OBJDIR)/*.o *.o *.moc.cpp
+ BINS = proxmark3 flasher fpga_compress #snooper cli
+ CLEAN = cli cli.exe flasher flasher.exe proxmark3 proxmark3.exe fpga_compress fpga_compress.exe snooper snooper.exe $(CMDOBJS) $(OBJDIR)/*.o *.o *.moc.cpp
  
  all: lua_build $(BINS)