i dont know how to get rid of the log :(
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	dayViewLog0.txt
	dayViewLog1.txt
	dayViewLog2.txt
	uDo_data.txt