integraded rrd
RRDatabase update
Merge branch 'master' into rrd

Conflicts:
	smart-power-service/build.gradle
	smart-power-service/src/main/java/edu/hm/smartpower/dao/MeterValueDao.java
	smart-power-service/src/main/java/edu/hm/smartpower/dao/MeterValueDaoImpl.java
	smart-power-service/src/main/resources/spring/applicationContext.xml
tests compile again, added commons-io
RRD updated
integraded rrd
RRDatabase update
tests compile again, added commons-io
RRD updated
seeding testdata for rrd
seeding testdata for rrd
Merge remote-tracking branch 'origin/rrd' into rrd

Conflicts:
	smart-power-service/src/main/java/edu/hm/smartpower/dao/MeterValueDao.java
	smart-power-service/src/main/java/edu/hm/smartpower/dao/MeterValueDaoImpl.java
	smart-power-service/src/main/java/edu/hm/smartpower/service/MeterValueServiceImpl.java
	smart-power-service/src/test/java/edu/hm/smartpower/dao/RRDBTest.java