Merge "Updated oomph egit setup"