transition of PT in process
Merge remote-tracking branch 'upstream/master'
fixed opencv include
intermediary commit
updated LoginBeforeUploadTask
added display for original tracking algorithm,etc
upload fixes
now uploading live data but there is still a problem with trying to login multiple data collects
fixed problem with multiple data collects
Merge pull request #715 from beejisbrigit/brigit_dev

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