Splash makes sense, labels on fields in Automatic
Merge remote-tracking branch 'upstream/master' into ms516
Merge pull request #518 from stowellm/ms516

Splash makes sense, labels on fields in Automatic
Android Data Collector control flow and usability update
Merge pull request #519 from stowellm/ms516

 Android Data Collector control flow and usability update
Field dialog states experiment number and title in it
Merge pull request #520 from stowellm/ms516

Field dialog states experiment number and title in it
merge changes together to prevent conflicts