Commiting to fetch from upstream
Merged with upstream, just had a conflict with a .xcodeproj file
Merge pull request #465 from stowellm/ms454

iPad + iPhone Layouts Supported By Manual in Any Orientation
Changing to merge upstream
Merged upstream
Splash is black and white, no more orb
Merge pull request #467 from stowellm/ms466

Splash is black and white, no more orb
Added newer assets and restructured iSENSE API
Removed some extra files
Removed more unused files
Merge remote-tracking branch 'upstream/master' into jp447
Merge pull request #468 from jaypoulz/jp447

Jp447 -- Added Assets/Clean Repo/Changed iSENSE_API configuration
Changed Splash logos and buttons, merged with new iSENSE static library
Merge pull request #469 from stowellm/ms466

Changed Splash logos and buttons, merged with new iSENSE static library
Added images and changed settings to be backwards compatible
Merged conflicts
Doing barrel rolls and adding new assets for Mike
Merge pull request #470 from jaypoulz/jp447

Jp447 -- Doing barrel rolls. (and adding new assets)
Started making nice buttons consistent
Merge remote-tracking branch 'upstream/master' into ms466