backup-17-08-2014
Merge branch 'master' of https://github.com/ragnar76/bbb-ds1820

Conflicts:
	log-files/pressure.log.xz
	log-files/temp_1.log.xz
	log-files/temp_2.log.xz
backup-17-08-2014