santi
Merge branch 'master' of github.com:EmiSancho/LogicTEC

Conflicts:
	LogicTec/nbproject/project.properties
	LogicTec/src/AccesoDatos/XML.java
	LogicTec/src/logictec/LogicTec.java
Merge branch 'master' of github.com:EmiSancho/LogicTEC