Merge pull request #1 from uh-nmb/master

Manual merge into new repo
Merge pull request #2 from uh-nmb/master

Sunflower additions
Merge pull request #3 from uh-nmb/master

Updates for Zuyd integration
Merge pull request #4 from uh-nmb/master

updates to python c++ integration and siena integration
Merge pull request #5 from uh-nmb/master

updates to cpp uncore interface
Merge pull request #6 from uh-nmb/master

Updates to cpp interface for Joe
Merge pull request #7 from uh-nmb/master

Organizational updates to code.  Removal of duplicate headers.
Merge pull request #8 from uh-nmb/master

Updates to Siena GUI web interface
Merge pull request #9 from uh-nmb/master

Update queries for siena gui, add proxemics
Merge pull request #10 from uh-nmb/master

Minor updates to passed arguments
Merge pull request #11 from uh-nmb/master

Fix error with converting vector to python list
Merge pull request #12 from uh-nmb/master

Corrections to user selection and proxemics code
Merge pull request #13 from uh-nmb/master

Proxemics integration
Merge pull request #14 from uh-nmb/master

Require cmd_id, use true/fasle in setting predicates from Sienna GUI
Merge pull request #15 from uh-nmb/master

Correct value representation during updates
Merge pull request #16 from uh-nmb/master

Add ZigbeeDirect, move sensor metadata to db
Merge pull request #17 from uh-nmb/master

Code hardening and corrections to cob state polling
Merge pull request #18 from uh-nmb/master

Correct incorrectly used PyString calls, further separate ros from Core
Merge pull request #20 from uh-nmb/master

Changes from Herleen, threading fixes
Merge pull request #21 from uh-nmb/master

Remove bad releaselock