Eclipseified repo.
Merge with master.