Merge remote-tracking branch 'upstream/master'

Conflicts:
	armsrc/iso14443b.c

diff --cc CHANGELOG.md
index 75b9ad9b5616e6c755ed54764e59994ae927cca7,b0135cc28195a3b3eb00ab845a247096ec9e3c8e..42b6bcbeb1cde0f845d9dc45763a12cced15ef45
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -2,12 -2,18 +2,19 @@@
  All notable changes to this project will be documented in this file.
  This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
  
- ## [Unreleased][unreleased]
+ ## [unreleased][unreleased]
+ 
+ ### Changed
+ - EPA functions (`hf epa`) now support both ISO 14443-A and 14443-B cards (frederikmoellers)
+ 
+ ## [2.2.0][2015-07-12]
  
  ### Changed
 +- Added `hf 14b raw -s` option to auto select a 14b std tag before raw command 
  - Changed `hf 14b write` to `hf 14b sriwrite` as it only applied to sri tags (marshmellow)
  - Added `hf 14b info` to `hf search` (marshmellow)
+ - Added compression of fpga config and data, *BOOTROM REFLASH REQUIRED* (piwi)
+ - Implemented better detection of mifare-tags that are not vulnerable to classic attacks (`hf mf mifare`, `hf mf nested`) (piwi)
  
  ### Added
  - Add `hf 14b info` to find and print info about std 14b tags and sri tags (using 14b raw commands in the client)  (marshmellow)

diff --cc armsrc/iso14443b.c
Simple merge