Merge branch 'master' of https://github.com/theforeman/foreman-xen

Conflicts:
	app/models/foreman_xen/xenserver.rb
	app/views/compute_resources_vms/form/_xenserver.html.erb
Merge branch 'development' of github.com:HeWhoWas/foreman-xen into development

Conflicts:
	app/models/foreman_xen/xenserver.rb