Cleaned up iOS code and rewrote comments to make it legible
Hopefully fixed conflicts
Merge remote-tracking branch 'upstream/master' into jp361
Merge pull request #391 from jaypoulz/jp361

Hopefully clean up all the code so Mike can read it!
Silence git, I am trying to pull Jeremy's changes
Fixed merge conflicts
Working splash with nav controllers
Actually fixed merge conflicts this time
Merge pull request #393 from jaypoulz/jp361

Actually fixed merge conflicts this time
Xcode is trolling me
Merge pull request #394 from jaypoulz/jp361

Xcode is trolling me
Please stop failing
Merge pull request #395 from jaypoulz/jp361

Please stop failing
Merge pull request #392 from stowellm/ms380

Working splash with nav controllers 
Splash complete with iPad layouts and functional guide/about
Merge pull request #396 from stowellm/ms380

Splash complete with iPad layouts and functional guide/about
Merge pull request #397 from AlanRosenthal/AR_Issue389

See commits
Added manual view to splash.  Ready to work on manual.
Merge pull request #398 from stowellm/ms380

Added manual view to splash.  Ready to work on manual.
Fixed 2 warnings regarding code I forgot to delete in the delagate