lcd done
adjust the tags of lcd article
Merge branch 'master' into my

Conflicts:
	lcd/lcd.prst
touch screen done