Merge branch 'master' of github.com:synapsepd/openair

Conflicts:
	lib/openair/client.rb