Merge origin/master

Conflicts:
	funciones.php
Merge origin/master

Conflicts:
	DatabaseManager.php
	registro.php
Merge origin/master

Conflicts:
	DatabaseManager.php
	registro.php
Merge origin/master

Conflicts:
	DatabaseManager.php
	registro.php
Merge origin/master

Conflicts:
	DatabaseManager.php
	registro.php
Merge origin/master

Conflicts:
	DatabaseManager.php
	registro.php
Merge origin/master

Conflicts:
	DatabaseManager.php
	registro.php
Merge origin/master

Conflicts:
	DatabaseManager.php
	registro.php
Merge origin/master

Conflicts:
	DatabaseManager.php
	registro.php
Merge origin/master

Conflicts:
	DatabaseManager.php
	registro.php
Merge origin/master

Conflicts:
	DatabaseManager.php
	registro.php
Merge origin/master

Conflicts:
	DatabaseManager.php
	registro.php
Merge origin/master

Conflicts:
	DatabaseManager.php
	registro.php
Merge origin/master

Conflicts:
	DatabaseManager.php
	registro.php
Merge origin/master

Conflicts:
	DatabaseManager.php
	registro.php
Merge origin/master

Conflicts:
	DatabaseManager.php
	registro.php
Merge origin/master

Conflicts:
	DatabaseManager.php
	registro.php
Merge origin/master

Conflicts:
	DatabaseManager.php
	registro.php
Merge origin/master

Conflicts:
	DatabaseManager.php
	registro.php
Merge origin/master

Conflicts:
	DatabaseManager.php
	registro.php