Revert "ensure that the scala entities are in a file near to the java ones"

This reverts commit 17e4892a1e81572e76c3c1bd7b91ec9957af7556.

It seems that the scala compiler that we use to build the archives
don't like having both a scala and a java file of the exact same name.
It results in an internal exception, so we'd better not do it just for
sake of cosmetics in our tree.
Revert "search the scala templates in the right file after recent file renames"

This reverts commit 4de689bffa52bdab00e64cb667c1b88dc4d12ceb.
Update our embeeded java compiler to OpenJDK7 (fix #327)
Merge branch 'master' of github.com:oster/PLM