Nueva app ammfen
Merge branch 'Desarrollo'

Conflicts:
	.gitignore
	app/config/app.php
	vendor/swiftmailer/swiftmailer/tests/_samples/charsets/iso-2022-jp/one.txt