Ooyala 1.4.0 podspec
Merge branch 'master' of https://github.com/twlopes/Specs

Conflicts:
	Ooyala/1.4.0/Ooyala.podspec