serialpart package added socket event touchpad code added
master branchupdated for conflicts
clearing commites
All merging conflicts reviewed, master update