Lock version added to users
Lock version as an allowed parameter =)
Merge ../x0y0

Conflicts:
	db/schema.rb