Merge branch 'shifts_v2' into rails2_master
pull in fake_users from the branch off of rails3
added fake location email task
Update validation for Rails 3
pull in fake_users from the branch off of rails3
added fake location email task
Update validation for Rails 3
Fix merge conflicts
Merge branch '213_change_location_email' into rails-3.2

Conflicts:
	Gemfile