fixed bugs in list and dogfed my stuff :)
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	dayViewLog2.txt