Added the location index to the user model and made some other tests pass
Merge branch 'lio-con-el-api' of github.com:vjustov/Hitchhiker into lio-con-el-api

Conflicts:
	app.rb
	lib/user.rb
	spec/api/api_spec.rb