8 may
Merge branch 'master' of https://github.com/ocornejo/proj

Conflicts:
	mail_contacts.xml
	temp/Resumen_Aseos_Cabina_08-05-2013.xls