WIP
Resolve merge conflict
Merge branch 'master' of github.com:andrewhao/mailbox into api-letter

Conflicts:
	app/models/api/supporter.rb
Merge pull request #14 from andrewhao/api-letter

WIP Api::Supporter