fix merge issue
Merge remote-tracking branch 'upstream/master' into bd859
isense import changed imac
merge errors imac
fixed merge conflicts
Merge remote-tracking branch 'upstream/master' into bd859
changed menu order and worked on description dialog
a

ge remote-tracking branch 'upstream/master' into bd859

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Updated the description layout for Pictures App
Merged with remote changes
Merge remote-tracking branch 'origin/bd859' into bd859
Minor layout changes to Uploader
Changed color of (requires project) text on disabled buttons
Merge pull request #878 from stowellm/goat

Layout changes in Uploader - Button colors, Padding on Setup
you can now enter your own photo description
App uploads data now
Merge pull request #880 from bdonald25/bd859

Upload data, fix menu, description
icon for picture app
Merge branch 'master' of ssh://github.com/isenseDev/iSENSE-Hardware into parachute
Merge pull request #881 from nickavv/parachute

Picture Walk icon