email settings file
Merge branch 'master' of https://github.com/ecopro/almaixera

Conflicts:
	.gitignore