添加点views-users-edit
Merge branch 'master' of https://github.com/lclouds/cloud-lab

Conflicts:
	db/development.sqlite3
	log/development.log