Merged changes

Merged silk screen and routing changes with rework of the UART lines.
Part numbers updated.