Updated master branch.
Merge remote-tracking branch 'origin/master'
Changed WorldExt class definition.
Added some directories to gitignore
First version of the vibration model
For git gui work without complaints
git warnings...
Merge branch 'heat-integration' of https://github.com/larics/assisi-playground into vibration
Implemented a new variation of a vibration source.
Moved vibration test to directory test/vibration.
Added an octave script to test the new vibration source.
Added cmake rules to .gitignore
Added a visualisation option to AssisiPlayground.
Shows heat and vibration.
Tested the heat and vibration visualisation.
Merge branch 'heat'

Conflicts:
	extensions/Component.h
Merge branch 'heat' into vibration

Conflicts:
	CMakeLists.txt
	interactions/HeatActuator.cpp
Visualization code.
Heat visualization code.
Visualization code.
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
Merge pull request #27 from plsm/vibration

Merge of visualization functionality + vibration. Closes #5.