Hopefully the conflicts were resolved and nothing has broken.

Merge remote-tracking branch 'max/master'

Conflicts:
	README.md
	lib/omf-sfa/am/am-rpc/am_rpc_service.rb
	lib/omf-sfa/am/am_manager.rb
	lib/omf-sfa/am/am_server.rb
	lib/omf-sfa/resource/gurn.rb
	lib/omf-sfa/resource/node.rb
	lib/omf-sfa/resource/oaccount.rb
	lib/omf-sfa/resource/ocomponent.rb
	lib/omf-sfa/resource/olease.rb
	lib/omf-sfa/resource/oproperty.rb
	lib/omf-sfa/resource/oresource.rb
	lib/omf-sfa/resource/sfa_base.rb