fixed stuff
Merge branch 'Branch'

Conflicts:
	src/main/scala/metascala/rt/Thread.scala
test