Merge branch 'master' of https://github.com/isenseDev/iSENSE-Hardware into vb548
API and QR code stuff
Stuff
Merge pull request #990 from balabhv/vb548

Visual changes
Merge pull request #991 from balabhv/vb548

Various housekeeping and bug fixes to the Android apps.
Clean up some login code so Brigit can test
Merge remote-tracking branch 'upstream/master' into pendulum
Merge pull request #992 from jaypoulz/pendulum

Pendulum -- Minor Stability and Cleanup to Enable Testing for Pendulum Tracker
Merge conflicts
Merge branch 'master' of https://github.com/isenseDev/iSENSE-Hardware into vb548
Changed the API to use isenseproject.org instead of rsense.cs.uml.edu (which for some reason is changing our POST requests to GET requests and/or is simply not processing because of Black Magic
DNS or something.
Merge pull request #993 from jaypoulz/jpTemp

Changed the API to use isenseproject.org instead of rsense.cs.uml.edu (w...
Merging Changes
Merge branch 'master' of https://github.com/isenseDev/iSENSE-Hardware into vb548