Merge branch 'master' into improve-include-consistency

# Conflicts:
#	src/USER-MESO/atom_vec_tdpd.cpp

src/reader.cpp

@@ -74,3 +74,13 @@ void Reader::close_file()
   else fclose(fp);
   fp = NULL;
 }
+
+/* ----------------------------------------------------------------------
+   detect unused arguments
+------------------------------------------------------------------------- */
+
+void Reader::settings(int narg, char** /*args*/)
+{
+  if (narg > 0)
+    error->all(FLERR,"Illegal read_dump command");
+}