Merge remote-tracking branch 'upstream/master' into goat
Merge remote-tracking branch 'upstream/master' into goat
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
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
Started adding FieldMatching to the iAPILib.  Such unimplemented, much work.
Cleaned up Uploader of old splash, renamed folders
Merge pull request #904 from stowellm/goat

Added field matching classes, cleaned up old splash, renamed folders