update test
Merge branch 'master' into include_melt_transport

Conflicts:
	source/simulator/assembly.cc
change compaction pressure element back to Q1
fix a sign
add postprocessors for melt properties
Merged more of juliane's branch