Merge branch 'master' of http://git.choozmo.com:3000/choozmo/hhh_step_question into master

step_question/tests/dftest.py

@@ -33,7 +33,7 @@ def save_sheet(df,filename,tabname,startpos='A1'):
 def do_jobs():
     db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/hhh?charset=utf8mb4')
     cursor=db.query('SELECT sex,phone,email,building_case_name,building_case_type,decoration_style,decoration_budget,decoration_size,src,area,userid,time_stamp, utm_source FROM hhh.step_questions;')
-    df = pd.DataFrame(columns=('sex','phone','email','building_case_name','building_case_type','decoration_style','decoration_budget','decoration_size','src','area','userid', 'time_stamp', 'utm_source'))
+    df = pd.DataFrame(columns=('time_stamp', 'utm_source', 'sex','phone','email','building_case_name','building_case_type','decoration_style','decoration_budget','decoration_size','src','area','userid'))
 
     idx=0