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

Conflicts:
	src/main/java/rrdtool/BBDDrrdtool.java