Merge branch 'NIFTy_4' of gitlab.mpcdf.mpg.de:ift/NIFTy into NIFTy_4

nifty4/library/__init__.py

@@ -8,3 +8,4 @@ from .noise_energy import NoiseEnergy
 from .nonlinear_power_curvature import NonlinearPowerCurvature
 from .nonlinear_power_energy import NonlinearPowerEnergy
 from .nonlinear_wiener_filter_energy import NonlinearWienerFilterEnergy
+from .nonlinearities import Exponential, Linear, Tanh, PositiveTanh