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
Added time statistics to the screen output file for timestep 0 (if Timing output frequency is zero), and add numbers and timing information to the nonlinear itterations.
New files instead of the old ones
Initial mockup of compositional names etc.
Put more descriptive output with the nonlinear itteration counter and removed braces
Removed the timing information of the nonlinear iterations.
add composition names
add a test for the composition names
update test output
add some comments
included an assert that names are unique and an entry in changes.h
Merge pull request #37 from jdannberg/typenames

Typenames
Merge pull request #32 from jdannberg/advection_field

Advection field
Merge from upstream
Fix typo. Fix date.
Merge from upstream.