lots of changes!
Merge branch 'master' of https://github.com/jpstern/SoapBox

Conflicts:
	SoapBox/SoapBox.xcodeproj/project.pbxproj