updated users_controller and users_controller_spec

updated with new values (direction, distance)
fixed merge commit with users_controller_spec

Conflicts:
	spec/controllers/users_controller_spec.rb