# Conflicts:
#	app/src/main/java/fieldscience/cs/earlham/edu/fieldday/ReadingsDatabase.java

Rolled-back our change to min/target SDK version, now 22. Fixes HostID = unknown and crash on internal sampling.

Modify the addReading so that it iterate through the sensorValues and put them to cv. getColumnType is also updated to return FLOAT if the column is a sensor value.

Stream sites and sectors

This has been tested at this point. (This does not close the issue because I'm still working on the data visualization.)

See merge request !5

reorders columns in local streaming db to match remote streaming db, removes two redundant initializers

Upload table

I'd ask that someone please take this out and test it. I can merge tomorrow if we detect no problems. Problems are most likely to occur at database upload time, because only `uploadTables()` has been changed.

See merge request !4

Use the method sensor.getNumberValues() instead of the length of the lastValues to determine if C_VALUE_TWO and C_VALUE_THREE should be added for the current sensor.

Fix warnings and errors

These commits fix the subset of the Android Lint error and warning messages that seem, to me, unquestionably problematic (rather than a matter of preference). Please review for approval.

See merge request !3