sync

getting all the work from Ephys to upgrade to 1.7