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

Conflicts:
	armsrc/iclass.c
	client/loclass/cipher.c
	client/loclass/fileutils.h

client/loclass/fileutils.h

@@ -38,6 +38,9 @@
 
 #ifndef FILEUTILS_H
 #define FILEUTILS_H
+
+#ifndef ON_DEVICE
+
 /**
  * @brief Utility function to save data to a file. This method takes a preferred name, but if that
  * file already exists, it tries with another name until it finds something suitable.
@@ -58,7 +61,8 @@ int saveFile(const char *preferredName, const char *suffix, const void* data, si
  * @return
  */
 
-int loadFile(const char *fileName, void* data, size_t datalen);
+int fileExists(const char *filename);
+#endif //ON_DEVICE
 
 /**
  * Utility function to print to console. This is used consistently within the library instead
@@ -68,5 +72,4 @@ int loadFile(const char *fileName, void* data, size_t datalen);
  * @param fmt
  */
 void prnlog(char *fmt, ...);
-int fileExists(const char *filename);
 #endif // FILEUTILS_H