update sbt project to use subprojects, this intends to fix eclipse project generation
Merge branch 'master'

Conflicts:
	REScalaTests/test/rescala/test/HigherOrderTestSuite.scala