filter contacts by timezone, set timezone on contact save
Merge branch 'master' into contactAddressLatLong

Conflicts:
	app/assets/javascripts/angular/controllers/contacts.js
	app/views/contacts/index.html.erb
Merge in master
Add contact timezone filter to tasks page
Add a task to set timezones for contacts.

Temporarily disable the set_timezone callback on
contact.rb
Use update_column in rake task
set_timezone, use timeZoneId to get time zone name
No timezone to nil
Merge branch 'master' into contactAddressLatLong
App wide contact search
Wildcard contact search
Commit .rspec file
Add phone number to contact wildcard search
Queue geocode updates for accounts lists when users log in.
Merge branch 'contactAddressLatLong'
Don't use EmojiFormatter :(
clear search field on filter reset
Move set_timezone to an after_commit hook.
Merge branch 'master' into contactSearchFromAllPages

Conflicts:
	app/assets/javascripts/angular/controllers/contacts.js
Merge in master