Merge remote-tracking branch 'upstream/master' into goat
Merge remote-tracking branch 'upstream/master' into jp822
Merge remote-tracking branch 'upstream/master' into bd859
Merge remote-tracking branch 'origin/bd859' into bd859
Merge remote-tracking branch 'upstream/master' into jp822
Merge remote-tracking branch 'upstream/master' into bd859
added camera to manifest
Merge remote-tracking branch 'upstream/master' into goat
camera connects but does not take pictures
Merge remote-tracking branch 'upstream/master' into jp822
Started implementing the new welcome and select mode layouts into Uploader. Known broken pieces: corrupted navbar on ProjectBrowse, SelectMode needs to be rotated to show
Fixed ProjectBrowse corrupting the navbar by explicitly pushing SelectMode VC onto the VC stack.  Also got SelectMode to display properly upon show.  All that is left for the new splash implementation is implementing global proj prefs into Automatic and Manual
Fixed layout constraint issues on Welcome, global proj prefs implemented in iOS manual
Fixed up StepOneSetup xibs to use project over experiment, resized pieces
camera opens the first time but is being passed a null preview so it crashes the next time it tries to open
Implemented global proj prefs in automatic ios
Merge pull request #903 from stowellm/goat

Implemented entire new splash/welcome to uploader with global proj preferences
fixed merge conflicts
working on camera preview work around
Started adding FieldMatching to the iAPILib.  Such unimplemented, much work.