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
Add an entry about the last merge.
Merge pull request #32 from jdannberg/advection_field

Advection field
Merge from upstream
Fix typo. Fix date.
Merge from upstream.
Reestablish an entry that was lost in one of the previous commits.
Merge branch 'master' of github.com:geodynamics/aspect into freesurface

Conflicts:
	doc/modules/changes.h
	source/simulator/core.cc