excerpt
Merge branch 'master' of https://github.com/leolanzinger/mailclient

Conflicts:
	app/src/main/res/layout/email_list.xml