Merge origin/master

Conflicts:
	DisenoDeSistemas/nbproject/project.properties