change ui
Merge branch 'dev' of github.com:vuphamhoai/Cloud into dev
change ui
Conflicts:
	app/views/users/_sidebar.html.erb
	config/routes.rb
change ui
virtual machine
virtual machine