minor fixes, brought in changes in main from master
Merge remote-tracking branch 'origin/newlcd'

Conflicts:
	DataBus/main.cpp