Merge remote-tracking branch 'origin/master' into membership

Conflicts:
	controller/app/rest_models/rest_embedded_cartridge.rb
	node-util/bin/oo-admin-cartridge
Add domain views
Debug output