moved resource configuration to instance level
moved resources configuration to instance level
Merge branch 'instance_config' into merge/master_instance_config

Conflicts:
	lib/patches/membership_patch.rb