Merge branch 'master' of https://github.com/iliaskarim/CocoaSoundCloudUI

Conflicts:
	SoundCloudUI.xcodeproj/project.pbxproj