fix order for users_info
try joining roles, instead of including them
dont' fail on comments of deleted users
set teams controller spec pending
set users controller spec pending
Merge branch 'master' of github.com:rails-girls-summer-of-code/rgsoc-teams
make mailings unique, fix query that retrieves the Users for a mailing
Group users
Show gravatar icons at 40x40
Merge pull request #47 from carpodaster/fix/list-users-uniquely

List users uniquely
adding timezones to users #40
Move timezones into a constant
Merge branch 'add_timezones' of github.com:pxlpnk/rgsoc-teams into add_timezones

Conflicts:
	app/helpers/application_helper.rb