attach file
ui chang
Merge remote-tracking branch 'origin/khaled'

Conflicts:
	M@ilMaster/AndroidManifest.xml
	M@ilMaster/bin/AndroidManifest.xml
	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/MailSenderActivity.class
	M@ilMaster/bin/classes/TIG055st2014/mailmaster/R$id.class
	M@ilMaster/bin/classes/TIG055st2014/mailmaster/R$layout.class
	M@ilMaster/bin/resources.ap_
	M@ilMaster/gen/TIG055st2014/mailmaster/R.java
	M@ilMaster/res/layout/activity_compose.xml
	M@ilMaster/res/layout/activity_mail_sender.xml
	M@ilMaster/res/values/strings.xml
	M@ilMaster/src/TIG055st2014/mailmaster/ComposeActivity.java