edit surface resistance
Merge branch 'master' of https://github.com/Likferd/EMF2

Conflicts:
	StriplineClass.m