Sensible error msg in Scala for code out of any method (fix #262)
Merge branch 'master' of github.com:oster/PLM

Conflicts:
	ChangeLog