adding fixes for screeens mispell, bug which allows user to upload data multiple times after single data collect, throw out (0,0) points.
added start/stop button in place of 2 separate button
added start/stop button in place of 2 separate button
new icons!
more icons
current time now obtained from System call
marker detector changes
Merge branch 'master' of github.com:isenseDev/iSENSE-Hardware into brigit_dev
Android: Data is always recorded as JSONArray of JSONArrays, and then is reordered on upload, even if data is not saved to queue.
iOS: Login and browse projects works
Merge stuff
Working on my last 2 functions
Merge pull request #842 from stowellm/goat

Added a global project ID to Uploader, changed CLP launcher again
Merge remote-tracking branch 'upstream/master' into hamster
Fixed merged conflicts for icon images
Merge pull request #834 from beejisbrigit/brigit_dev

Brigit dev
API fix for browse projects, and updates for append data set
Append data finally works after a 2 hour work with objective c
Merge remote-tracking branch 'upstream/master' into hamster
Merge pull request #844 from jaypoulz/hamster

Objective-C is the worst language ever created ever.  Like really.  Of all time.  Yeah.
Merge pull request #846 from balabhv/vb548

Lots of changes that I haven't merged yet