Merge pull request #8 from andrewhao/api-letter

API letter
We've added the Api::Supporter
Merge pull request #9 from andrewhao/user-auth-api

We've added the Api::Supporter
initial viewer flow
Merge branch 'master' of https://github.com/andrewhao/mailbox

Conflicts:
	config/routes.rb
improve contacts import with ajax import/skip actions
Merge branch 'master' of https://github.com/andrewhao/mailbox

Conflicts:
	config/routes.rb
Merge pull request #10 from nathankopp/master

improve contacts import with ajax import/skip actions
Fixing some tests
Merge pull request #11 from andrewhao/fix-tests

Fixing some tests
fixups
Merge branch 'master' of https://github.com/andrewhao/mailbox
Forcing production to use SSL.
Merge pull request #12 from andrewhao/auto-redirect-ssl

Forcing production to use SSL.
Update README.md
Merge.
filter contact to only those with email and phone
Gmail import ui improvements
Merge pull request #13 from nathankopp/master

UI improvements for contact import and supporter management
Merge branch 'master' of github.com:andrewhao/mailbox into api-letter

Conflicts:
	app/models/api/supporter.rb