SBT build file and generated Eclipse project
Tune Eclipse project
More tuning (through Eclipse)
Merge remote-tracking branch 'origin2/master'