Merge pull request #855 from stowellm/goat

Field matching dialog, push Uploader/DataWalk to store
Removed old sensor dialog items, re-worded field matching text, added back button, cleaned lint.