Merge branch 'master' of github.com:CoopTera/ecc-tramites-api

# Conflicts:
#	database/seeders/DatabaseSeeder.php