attach
more attach
Merge branch 'master' of https://github.com/britsman/MailMaster

Conflicts:
	M@ilMaster/bin/M@ilMaster.apk
	M@ilMaster/bin/classes.dex
	M@ilMaster/bin/classes/TIG055st2014/mailmaster/ComposeActivity.class
	M@ilMaster/bin/classes/TIG055st2014/mailmaster/EmailAdapter.class
	M@ilMaster/bin/classes/TIG055st2014/mailmaster/InboxActivity.class
	M@ilMaster/bin/classes/TIG055st2014/mailmaster/R$id.class
	M@ilMaster/bin/classes/TIG055st2014/mailmaster/R$layout.class
	M@ilMaster/bin/classes/TIG055st2014/mailmaster/R$menu.class
	M@ilMaster/bin/classes/TIG055st2014/mailmaster/R$string.class
	M@ilMaster/bin/classes/TIG055st2014/mailmaster/R$style.class
	M@ilMaster/bin/classes/TIG055st2014/mailmaster/ReplyActivity.class
	M@ilMaster/bin/classes/TIG055st2014/mailmaster/ShowEmailActivity.class
	M@ilMaster/bin/dexedLibs/activation-f68afb0ffd9a0d4d18babe21d933063c.jar
	M@ilMaster/bin/dexedLibs/additionnal-eca9c7742257907c6f4b70cc51288682.jar
	M@ilMaster/bin/dexedLibs/android-support-v4-21cd9739d692796034e3238d81662ac3.jar
	M@ilMaster/bin/dexedLibs/mail-1da6e1bfe4a3b490ca3b5da6a35591dd.jar
	M@ilMaster/bin/resources.ap_
	M@ilMaster/gen/TIG055st2014/mailmaster/R.java
	M@ilMaster/res/layout/activity_compose.xml
	M@ilMaster/src/TIG055st2014/mailmaster/ComposeActivity.java