don't be stupid.
updating pods so things build
Merge branch 'master' into experimental

Conflicts:
	SCTest/Classes/WaveFormView.m