Fooling with Scala peculiarities
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/scala/ch/netzwerg/dsl/DSL.scala