n
Merge branch 'master' of https://github.com/MailCarrier/android

Conflicts:
	MailCarrier/bin/MailCarrier.apk
	MailCarrier/bin/classes.dex
	MailCarrier/bin/resources.ap_