Merge branch 'wdat2-develop' into andrey
new module for unit conversion added
units conversion done for analogsignals and spiketrains
Merge branch 'andrey' into stoewer
Merge branch 'stoewer' into wdat2-develop