Merging master
Merge branch 'master' of git://github.com/isenseDev/rSENSE into gpx
Pulling to hopefully fix Nat and Skittles aweful
Merge branch 'master' of git://github.com/isenseDev/rSENSE into gpx
Fixing a bug with file upload and adding ability to upload gpx files.
Merge branch 'master' of git://github.com/isenseDev/rSENSE into gpx
Hiding file upload field
Adding rescue back to datafileupload
Merge pull request #997 from jdalphon/gpx

Bug fix and GPX