Always keep java and scala dirs in all projects
Merge branch 'master' of github.com:adept-dm/adept