Merge origin/master

Conflicts:
	src/java/Controlador/Formularios.java
	src/java/Modelo/ConexionBD.java