Merge branch 'hotfix/v2.25'

rowers/dataprep.py

@@ -901,11 +901,11 @@ def prepmultipledata(ids,verbose=False):
 # pandas dataframe
 def read_cols_df_sql(ids,columns):
     # drop columns that are not in offical list
-    axx = [ax[0] for ax in axes]
+#    axx = [ax[0] for ax in axes]
+    axx = StrokeData._meta.get_all_field_names()
     for c in columns:
         if not c in axx:
             columns.remove(c)
-            print c,'aap'
     
     columns = list(columns)+['distance','spm']
     columns = [x for x in columns if x != 'None']