generat user model
Merge branch 'B-master_secure' into merge_code

Conflicts:
	app/models/user.rb
	test/fixtures/users.yml