little changes (testconv routine and save temp in nonlinear routine)

Conflicts:

	src/class_navier/class_navier_3D.f90
	src/main/navier3d.f90
der2 solver