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
Fixed merged conflicts for icon images
Merge pull request #834 from beejisbrigit/brigit_dev

Brigit dev
Merge remote-tracking branch 'upstream/master' into hamster