May and Macron announce new measures to deal with migrants and Calais