France to take in 24,000 refugees over next 2 years