Se modifica clase mysql
Merge origin/master

Conflicts:
	config.json
	config/config.php
	config/database.php
	db/connections.php
	db/database_interface.php
	db/mysql.php
	index.php
	loader.php
Merge origin/master

Conflicts:
	config.json
	config/config.php
	config/database.php
	db/connections.php
	db/database_interface.php
	db/mysql.php
	index.php
	loader.php