Commit df243d58 authored by niklas.thiel's avatar niklas.thiel

Merge branch 'develop' into pup

Conflicts:
	doc/latex/6_Parameter_Definition.tex
	src/IFOS2D.c
	src/calc_misfit.c
	src/exchange_par.c
	src/globvar.h
parents 914e765c 973a56a6