Michal change

Michal
change
Merge remote-tracking branch 'origin/master'

Conflicts:
	demoBoard.cpp