stufffff
Probably removed the conflictz
Merge pull request #676 from stowellm/ms636

Finished canobie physics v2
Everything done but linked minterval to recording rate
Merge pull request #677 from Rajia/ra553

Everything done but linked minterval to recording rate
App is Finished
Nyeh
Merge pull request #678 from Rajia/ra553

Finished version of DataWalk V2
Updated a bunch of UIs and logos
removed stuffz
Merge pull request #679 from jaypoulz/jp646

Jp646 -- new logos and ui updates for some apps + small bug fixes on Android
Insanity
Merge remote-tracking branch 'upstream/master' into vb653
Made is so that automatic will only upload automatic sessions and manual will only upload manual sessions.

*Important*
Changed DataSaver's upload method to take a parent object! Make sure this matches the dataSet parent you assign.
Merge pull request #680 from jaypoulz/jp646

Made is so that automatic will only upload automatic sessions and manual...
Hotfixes for my queue changes that won't explode if you delete datasets anymore
Merge pull request #681 from jaypoulz/hamster

Hotfixes for my queue changes that won't explode if you delete datasets ...
Fixed Lines going underneath upload button, and more bugs
Merge remote-tracking branch 'upstream/master' into vb653
Merge pull request #683 from balabhv/vb653

Fixed lines going under upload button