Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Continued implementation of step 1 setup - sample interval/test length prefs
saving now works.
Merge pull request #560 from jaypoulz/jp508

Major rSENSification of Automatic.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of ssh://github.com/jaypoulz/iSENSE-Hardware
Merged with upstream
Fixed merge head conflict with 2 xib files