Added testing results done by @lukashaertel
Resolved merge conflicts
Merged Sensor Collector Template
Merge branch 'cEhlen-master'