Merge branch 'master' of http://bitbucket.poconsole.net/scm/poconsole/datalogger

# Conflicts:
#	dataLogger_SQLite_pycomm.py

create_SQLite_db.sql

@@ -40,7 +40,8 @@ CREATE TABLE IF NOT EXISTS Well_Test (
   api_gravity_oil REAL,
   sg_oil REAL,
   sg_water REAL,
-  test_hours REAL
+  test_hours REAL,
+  deleted INTEGER DEFAULT 0
 );
 
 CREATE TABLE IF NOT EXISTS config (
@@ -76,9 +77,11 @@ INSERT INTO note_types (id, type) VALUES ('4', 'Other');
 CREATE TABLE IF NOT EXISTS fluid_shot(
   id INTEGER PRIMARY KEY,
   shot_datetime TIMESTAMP,
+  taken_by TEXT,
   pump_intake_pressure REAL,
   fluid_gradient REAL,
-  friction REAL
+  friction REAL,
+  deleted INTEGER DEFAULT 0
 );
 
 CREATE TABLE IF NOT EXISTS card_history(