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

Conflicts:
	app/models/foreman_xen/xenserver.rb
Merge branch 'master' of github.com:HeWhoWas/foreman-xen