Combined Splash and Data Collector, renamed the 2 separate apps _RAW
Merge pull request #402 from stowellm/ms399

Combined Splash and Data Collector, renamed the 2 separate apps _RAW
Fixed the project definition.
Merge remote-tracking branch 'upstream/master' into jp361
Removed old, broken data collector.  It contained mere references.
Combined Data Collector and Splash with --hopefully-- no more file references
Merge pull request #403 from stowellm/ms399

Removed File References
Rewriting the iSENSE_API to use iOS5
Fixed silly merge conflicts
Re-created manual layouts.  They were bugged from being copied
Merge pull request #404 from stowellm/ms399

Re-created manual layouts.  They were bugged from being copied
Cleaned up git
Mike should stop pull requesting
Cleaned up files and started adding libraries
Set up external library for testing login