Conflicts:
	dcmgr-gui/Gemfile
	dcmgr-gui/public/javascripts/wakame-gui/client/Main.js
	dcmgr/Gemfile
	dcmgr/lib/dcmgr/models/instance.rb
	dcmgr/lib/dcmgr/scheduler.rb
	dcmgr/lib/dcmgr/web/base.rb
	hvc-hva/vendor/wakame/lib/wakame/master_managers/agent_monitor.rb