Merge branch 'jas'

Conflicts:
	ls_displayModes.ino
github conflict fix