Merge branch 'master' of github.com:tosik/ios-ruby-embedded

Conflicts:
	Rakefile