Merge remote-tracking branch 'Proxmark/master' into iclass

Conflicts:
	CHANGELOG.md

diff --cc CHANGELOG.md
index dffe9a81a464b107ac3fddf3b33ddac15a948f28,e2196a39afb8ed1c1d54fdf2311d4bb813cae4db..c5ccc8f751a1c28176dd7382c64c2966b9a861c0
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -5,19 -5,16 +5,27 @@@ This project uses the changelog in acco
  ## [unreleased][unreleased]
  
  ### Added
 +- `hf iclass managekeys` to save, load and manage iclass keys.  (adjusted most commands to accept a loaded key in memory) (marshmellow)
 +- `hf iclass readblk` to select, authenticate, and read 1 block from an iclass card (marshmellow)
 +- `hf iclass writeblk` to select, authenticate, and write 1 block to an iclass card (or picopass) (marshmellow + others)
 +- `hf iclass clone` to take a saved dump file and clone selected blocks to a new tag (marshmellow + others)
 +- `hf iclass calcnewkey` - to calculate the div_key change to change a key - (experimental) (marshmellow + others)
 +- `hf iclass encryptblk` - to encrypt a data block hex to prep for writing that block (marshmellow)
  - ISO14443a stand-alone operation with ARM CFLAG="WITH_ISO14443a_StandAlone". This code can read & emulate two banks of 14a tag UIDs and write to "magic" cards  (Craig Young) 
  - AWID26 command context added as 'lf awid' containing realtime demodulation as well as cloning/simulation based on tag numbers (Craig Young)
+ - Added 'hw status'. This command makes the ARM print out some runtime information. (holiman) 
+ - Added 'hw ping'. This command just sends a usb packets and checks if the pm3 is responsive. Can be used to abort certain operations which supports abort over usb. (holiman)
+ - Added `data hex2bin` and `data bin2hex` for command line conversion between binary and hexadecimal (holiman)
  
  ### Changed
++<<<<<<< HEAD
 +- changed `lf config t <threshold>` to be 0 - 128 and will trigger on + or - threshold value (marshmellow) 
 +- `hf iclass dump` cli options - can now dump AA1 and AA2 with different keys in one run (does not go to muliple pages for the larger tags yet)
++=======
+ - Revised workflow for StandAloneMode14a (Craig Young)
++>>>>>>> Proxmark/master
  - EPA functions (`hf epa`) now support both ISO 14443-A and 14443-B cards (frederikmoellers)
+ - 'hw version' only talks to ARM at startup, after that the info is cached. (pwpiwi)
  
  ## [2.2.0][2015-07-12]
  

diff --cc armsrc/appmain.c
Simple merge

diff --cc armsrc/apps.h
Simple merge

diff --cc client/cmdhfmf.c
Simple merge

diff --cc client/lualibs/commands.lua
Simple merge

diff --cc client/util.h
Simple merge

diff --cc include/usb_cmd.h
Simple merge