Merge branch 'master' of https://github.com/msrba/rOCCI into cloud4e

Conflicts:
	lib/occi/api/client/client_amqp.rb
	occi.gemspec
	spec/occi/api/client/client_amqp_spec.rb