download
Merge remote-tracking branch 'origin/khaled'

Conflicts:
	M@ilMaster/res/values/strings.xml
	M@ilMaster/src/TIG055st2014/mailmaster/AttachmentsActivity.java
	M@ilMaster/src/TIG055st2014/mailmaster/ComposeActivity.java
	M@ilMaster/src/TIG055st2014/mailmaster/MailFunctionality.java