Merge origin/master

Conflicts:
	monicaticoo/nbproject/project.properties
Merge origin/master

Conflicts:
	monicaticoo/src/db_managment/Direct_Control_BD.java
	monicaticoo/src/monicaticoo/main.java