Merge remote-tracking branch 'origin/master'

Conflicts:
	controlador/conexiondb.php
	includes/conexiondb.php
	index.html
	modelo/conexiondb.php