rename temperature_or_composition to advection_field
run astyle
use introspection for the block index
Merge branch 'master' into advection_field

Conflicts:
	source/simulator/assembly.cc
	source/simulator/solver.cc
some more renaming
Merge pull request #32 from jdannberg/advection_field

Advection field