add wireshark and clipx; repair the auto switch on clipx
Merge remote-tracking branch 'origin/master'