upgrade to Scala 2.10.4-RC1
upgrade to Scala 2.10.4-RC2
Merge branch 'headless' into scala-2.10.4
upgrade to Scala 2.10.4-RC3
Merge branch 'headless' into scala-2.10.4

Conflicts:
	.travis.yml
upgrade to Scala 2.10.4
Merge pull request #566 from NetLogo/scala-2.10.4

upgrade to Scala 2.10.4