Revert "Merge branch 'master' into TempBranch"

This reverts commit f3950d50f763779f247180b4a546fda55b99b7c7.

Conflicts:
	VibrateAnalysis/Base.lproj/Main_iPhone.storyboard