Extension 2
Merge branch 'master' of https://github.com/fikovnik/ttc14-fixml-sigma

Conflicts:
	doc/Extensions.tex