Merge branch 'erplab_4.0.3.1'

Conflicts:
erplab_default_values.m
functions/erpresample.m
memoryerp.erpm
pop_functions/pop_averager.m