Merge pull request #1 from DLR-SR/master

TestMerge
Reformated the Licence
Merge branch 'master' of https://github.com/fvanderlinden/FaultTriggering

Conflicts:
	FaultTriggering/UsersGuide/ModelicaLicense2.mo
Merge branch 'master' of https://github.com/DLR-SR/FaultTriggering

Conflicts:
	FaultTriggering/UsersGuide/ModelicaLicense2.mo