Merge branch 'dev' of https://github.com/hector3/beflow.git into dev

Conflicts:
	src/main/java/rrdtool/BBDDrrdtool.java
RRD_Def(CREA BBDD + UDATE datos)
Merge pull request #24 from hector3/dev

Dev