file extension
Merge branch 'master' of https://github.com/britsman/MailMaster.git

Conflicts:
	M@ilMaster/src/TIG055st2014/mailmaster/AttachmentsActivity.java
	M@ilMaster/src/TIG055st2014/mailmaster/MailFunctionality.java