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

Conflicts:
	extensions/Component.h
Merge pull request #24 from plsm/master

Only small change in comment text formatting.