CP-Violation in the Two Higgs Doublet Model: from the LHC to EDMs