log.roo commit
Merge complete
log.roo commit
Merge branch 'master' into eturkovic-datacollector-and-dataprovider-impl
Thread added, still bugged
DataProvider thread working
log.roo commit
merge finished
Merge complete