Idiomas OK, bandera OK
Merge branch 'master' of https://github.com/raulinoamaral/fsni

Conflicts:
	vendor/autoload.php
	vendor/composer/autoload_classmap.php
	vendor/composer/autoload_real.php
merge