usernames instead of ids
Merge pull request #3 from meza/users

usernames instead of ids
Merge branch 'master' into messages

Conflicts:
	app/controllers/users_controller.rb
	app/helpers/users_helper.rb