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

Conflicts:
	armsrc/appmain.c
	armsrc/iclass.c

armsrc/util.c

@@ -12,6 +12,7 @@
 #include "util.h"
 #include "string.h"
 #include "apps.h"
+#include "BigBuf.h"
 
 
 
@@ -34,7 +35,7 @@ void print_result(char *name, uint8_t *buf, size_t len) {
 }
 
 size_t nbytes(size_t nbits) {
-	return (nbits/8)+((nbits%8)>0);
+	return (nbits >> 3)+((nbits % 8) > 0);
 }
 
 uint32_t SwapBits(uint32_t value, int nrbits) {
@@ -428,4 +429,3 @@ uint32_t RAMFUNC GetCountSspClk(){
 	}
 }
 
-