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

Conflicts:
	armsrc/epa.c

armsrc/epa.c

@@ -259,10 +259,6 @@ void EPA_PACE_Collect_Nonce(UsbCommand *c)
 		return;
 	}
 
-	// increase the timeout (at least some cards really do need this!)
-	iso14a_set_timeout(0x0002FFFF);
-	Dbprintf("epa: Epic!");
-	
 	// read the CardAccess file
 	// this array will hold the CardAccess file
 	uint8_t card_access[256] = {0};
@@ -436,8 +432,6 @@ int EPA_Setup()
 	
 	iso14a_set_timeout(10500);
 	
-	iso14a_set_timeout(10500);
-	
 	// select the card
 	return_code = iso14443a_select_card(uid, &card_select_info, NULL);
 	if (return_code != 1) {