Merge branch 'pr/1' into TempBranch

Conflicts:
VibrateAnalysis.xcodeproj/project.pbxproj
VibrateAnalysis/Base.lproj/Main_iPhone.storyboard