cleanup and removed future
Merge branch 'master' of
ssh://git@github.com/jetonmemeti/android-kitkat-nfc-library.git

Conflicts:
	AndroidKitKatNFCLibrary/src/main/java/ch/uzh/csg/nfclib/NfcInitiator.java