Added cypro,categories to podspec
Merge branch 'master' of github.com:Automatic/oauthconsumer

Conflicts:
	OAuthConsumer.podspec