Merge pull request #13 from nathankopp/master

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

Conflicts:
	app/models/api/supporter.rb
font sizing fixes, number formatting
Merge pull request #14 from andrewhao/api-letter

WIP Api::Supporter
Updates to supporter spec
Merge pull request #15 from andrewhao/api-supporter

Updates to supporter spec
Better draft/send/unsend workflow
Merge branch 'master' of https://github.com/andrewhao/mailbox

Conflicts:
	app/views/letters/index.html.haml