Reverted to the master version.
Fixed the build to prevent creating superfluous source directories (scala and/or java)
Merge remote-tracking branch 'origin/issue139' into issue139

Conflicts:
	project/build.scala