fin clase
Merge branch 'master' of github.com:magcarnota/php_cntg

Conflicts:
	CrudMysql/application/controllers/helpers/actionHelpersFunctions.php
	CrudMysql/application/models/dataGatewayMysql.php
	CrudMysql/application/views/forms/user.php
	CrudMysql/application/views/helpers/helpersFunctions.php
	CrudMysql/public/users.php
no