Merge branch 'master' into enh/NewAddNoiseInterface
Merge branch 'master' into enh/NewAddNoiseInterface

Conflicts:
	nipype/algorithms/misc.py
Fixed AddNoise interface
fix:computation of noise in AddNoise
Merge branch 'enh/NewAddNoiseInterface' into experimental

Conflicts:
	nipype/algorithms/misc.py
	nipype/algorithms/tests/test_auto_AddNoise.py
Merge new AddNoise