Merge origin/master

Conflicts:
	src/java/Modelo/ConexionBD.java
Merge origin/master

Conflicts:
	src/java/Modelo/ConexionBD.java
Merge origin/master