Merge gitHub/master

Conflicts:
	Gulf_SGC.php
	controllers/mainController.php
	helpers/DBManager.php
	helpers/Grid.php
	models/filesModel.php
	models/nonConformityModel.php
	models/notesModel.php
	models/tasksModel.php
	pluginConfig.php
#11 -> Adicion opción detalle