Updated master branch.
Merge remote-tracking branch 'origin/master'
Merge branch 'heat'

Conflicts:
	extensions/Component.h
First implementation of a mesh heat actuator.
Need visualization to test it.
Merge pull request #17 from plsm/heat

Merging Pedro's changes: excel heat model (for evaluating the model), mesh heat actuator. Fixes #26.
Merge pull request #24 from plsm/master

Only small change in comment text formatting.
Merge branch 'master' of https://github.com/larics/assisi-playground into vibration

Conflicts:
	playground/CMakeLists.txt