Fixing merge. Gaby. Fixed classpath and scala nature.
fixing...