edit
Merge branch 'master' of https://github.com/lclouds/cloud-lab

Conflicts:
	app/controllers/users_controller.rb