Se pasas a la version BETA
Merge origin/master

Conflicts:
	db/database_interface.php
	db/mysql.php
	index.php
Merge origin/master

Conflicts:
	db/database_interface.php
	db/mysql.php
	index.php