upgrade to Scala 2.10.0-M5
Merge remote-tracking branch 'origin/master' into scala-2.10

Conflicts:
	build.sbt
Merge remote-tracking branch 'origin/master' into scala-2.10

Conflicts:
	build.sbt
Merge remote-tracking branch 'origin/master' into scala-2.10
Merge remote-tracking branch 'origin/master' into scala-2.10
upgrade to Scala 2.10.0-M7
upgrade to Scala 2.10.0-RC1
attempt to avoid out of memory errors when building
use newer NetLogo jar with right Scala version
upgrade to Scala 2.10.0-RC2
upgrade to Scala 2.10.0 final